Mercurial > vim
changeset 21014:20133655107a v8.2.1058
patch 8.2.1058: multiline conceal causes display errors
Commit: https://github.com/vim/vim/commit/fc838d6cb0f22c77a6ee2befd034b593e1c5ea06
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 25 22:23:48 2020 +0200
patch 8.2.1058: multiline conceal causes display errors
Problem: Multiline conceal causes display errors.
Solution: Do not allow conceal cross over EOL. (closes https://github.com/vim/vim/issues/6326, closes https://github.com/vim/vim/issues/4854,
closes #6302)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 25 Jun 2020 22:30:15 +0200 |
| parents | 596fcbdf8323 |
| children | ab6fe3bdc65e |
| files | src/drawline.c src/testdir/test_conceal.vim src/testdir/test_diffmode.vim src/version.c |
| diffstat | 4 files changed, 41 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -1334,6 +1334,11 @@ win_line( &screen_search_hl, &has_match_conc, &match_conc, did_line_attr, lcs_eol_one); ptr = line + v; // "line" may have been changed + + // Do not allow a conceal over EOL otherwise EOL will be missed + // and bad things happen. + if (*ptr == NUL) + has_match_conc = 0; } #endif
--- a/src/testdir/test_conceal.vim +++ b/src/testdir/test_conceal.vim @@ -254,4 +254,26 @@ func Test_conceal_cursor_pos() call delete('XTest_conceal_curpos') endfunc +func Test_conceal_eol() + new! + setlocal concealcursor=n conceallevel=1 + call setline(1, ["x", ""]) + call matchaddpos('Conceal', [[2, 1, 1]], 2, -1, {'conceal': 1}) + redraw! + + call assert_notequal(screenchar(1, 1), screenchar(2, 2)) + call assert_equal(screenattr(1, 1), screenattr(1, 2)) + call assert_equal(screenattr(1, 2), screenattr(2, 2)) + call assert_equal(screenattr(2, 1), screenattr(2, 2)) + + set list + redraw! + + call assert_equal(screenattr(1, 1), screenattr(2, 2)) + call assert_notequal(screenattr(1, 1), screenattr(1, 2)) + call assert_notequal(screenattr(1, 2), screenattr(2, 1)) + + set nolist +endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -1118,4 +1118,16 @@ func Test_diff_rnu() call delete('Xtest_diff_rnu') endfunc +func Test_diff_multilineconceal() + new + diffthis + + new + call matchadd('Conceal', 'a\nb', 9, -1, {'conceal': 'Y'}) + set cole=2 cocu=n + call setline(1, ["a", "b"]) + diffthis + redraw +endfunc + " vim: shiftwidth=2 sts=2 expandtab