Mercurial > vim
changeset 18072:5f1554b2587c v8.1.2031
patch 8.1.2031: cursor position wrong when resizing and using conceal
Commit: https://github.com/vim/vim/commit/5babc6e858afbfa54aa0e203a64b9c70175487b7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 14 21:55:51 2019 +0200
patch 8.1.2031: cursor position wrong when resizing and using conceal
Problem: Cursor position wrong when resizing and using conceal.
Solution: Set the flags that the cursor position is valid when setting the
row and column during redrawing. (closes #4931)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 14 Sep 2019 22:00:03 +0200 |
| parents | ac2dff806259 |
| children | c53b2d988211 |
| files | src/screen.c src/testdir/dumps/Test_conceal_resize_01.dump src/testdir/dumps/Test_conceal_resize_02.dump src/testdir/test_conceal.vim src/version.c |
| diffstat | 5 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -5374,6 +5374,7 @@ win_line( wp->w_wcol = col - boguscols; wp->w_wrow = row; did_wcol = TRUE; + curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL; } #endif
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_conceal_resize_01.dump @@ -0,0 +1,6 @@ +|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e|,| |t|h|e| >b|a|c|k|t|i|c|k|s| |s|h|o|u|l|d| |b|e| |c|o|n|c|e|a|l|e|d| @16 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|4|0| @9|A|l@1|
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_conceal_resize_02.dump @@ -0,0 +1,7 @@ +|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e|,| |t|h|e| >b|a|c|k|t|i|c|k|s| |s|h|o|u|l|d| |b|e| |c|o|n|c|e|a|l|e|d| @16 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|4|0| @9|A|l@1|
--- a/src/testdir/test_conceal.vim +++ b/src/testdir/test_conceal.vim @@ -135,3 +135,23 @@ func Test_conceal_with_cursorline() call StopVimInTerminal(buf) call delete('XTest_conceal_cul') endfunc + +func Test_conceal_resize_term() + let code =<< trim [CODE] + call setline(1, '`one` `two` `three` `four` `five`, the backticks should be concealed') + setl cocu=n cole=3 + syn region CommentCodeSpan matchgroup=Comment start=/`/ end=/`/ concealends + normal fb + [CODE] + call writefile(code, 'XTest_conceal_resize') + let buf = RunVimInTerminal('-S XTest_conceal_resize', {'rows': 6}) + call VerifyScreenDump(buf, 'Test_conceal_resize_01', {}) + + call win_execute(buf->win_findbuf()[0], 'wincmd +') + call term_wait(buf) + call VerifyScreenDump(buf, 'Test_conceal_resize_02', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XTest_conceal_resize') +endfunc