Mercurial > vim
changeset 28269:20b28fbf7f03 v8.2.4660
patch 8.2.4660: cursorcolumn is sometimes not correct
Commit: https://github.com/vim/vim/commit/782c6744b49b30d9460ed00d4773666e42e07163
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 1 12:06:31 2022 +0100
patch 8.2.4660: cursorcolumn is sometimes not correct
Problem: Cursorcolumn is sometimes not correct.
Solution: Recompute the cursor column when entering Insert mode and the
cursor is on a character wider than a screen cell.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 01 Apr 2022 13:15:08 +0200 |
| parents | ec433fec31a6 |
| children | 503600e51a08 |
| files | src/edit.c src/testdir/dumps/Test_cursorcolumn_insert_on_tab_1.dump src/testdir/dumps/Test_cursorcolumn_insert_on_tab_2.dump src/testdir/test_highlight.vim src/version.c |
| diffstat | 5 files changed, 48 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -293,11 +293,14 @@ edit( conceal_check_cursor_line(cursor_line_was_concealed); #endif - /* - * Need to recompute the cursor position, it might move when the cursor is - * on a TAB or special character. - */ - curs_columns(TRUE); + // Need to recompute the cursor position, it might move when the cursor + // is on a TAB or special character. + // ptr2cells() treats a TAB character as double-width. + if (ptr2cells(ml_get_cursor()) > 1) + { + curwin->w_valid &= ~VALID_VIRTCOL; + curs_columns(TRUE); + } /* * Enable langmap or IME, indicated by 'iminsert'.
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_cursorcolumn_insert_on_tab_1.dump @@ -0,0 +1,8 @@ +|1+0&#ffffff0|2|3|4|5|6|7|8+0&#e0e0e08|9+0&#ffffff0| @65 +|a| @5> |b| @65 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|2|,|2|-|8| @8|A|l@1|
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_cursorcolumn_insert_on_tab_2.dump @@ -0,0 +1,8 @@ +|1+0&#ffffff0|2+0&#e0e0e08|3+0&#ffffff0|4|5|6|7|8|9| @65 +|a> @6|b| @65 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|2|,|2| @10|A|l@1|
--- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -592,6 +592,28 @@ func Test_cursorline_with_visualmode() call delete('Xtest_cursorline_with_visualmode') endfunc +func Test_cursorcolumn_insert_on_tab() + CheckScreendump + + let lines =<< trim END + call setline(1, ['123456789', "a\tb"]) + set cursorcolumn + call cursor(2, 2) + END + call writefile(lines, 'Xcuc_insert_on_tab') + + let buf = RunVimInTerminal('-S Xcuc_insert_on_tab', #{rows: 8}) + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_cursorcolumn_insert_on_tab_1', {}) + + call term_sendkeys(buf, 'i') + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_cursorcolumn_insert_on_tab_2', {}) + + call StopVimInTerminal(buf) + call delete('Xcuc_insert_on_tab') +endfunc + func Test_cursorcolumn_callback() CheckScreendump CheckFeature timers