Mercurial > vim
changeset 29674:b11130c6e694 v9.0.0177
patch 9.0.0177: cursor position wrong with 'virtualedit' and mouse click
Commit: https://github.com/vim/vim/commit/8f49e690dc7b6ed521fb11431e2a406d01c4de3a
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 9 14:19:40 2022 +0100
patch 9.0.0177: cursor position wrong with 'virtualedit' and mouse click
Problem: Cursor position wrong with 'virtualedit' and mouse click after end
of the line. (Hermann Mayer)
Solution: Do not use ScreenCols[] when 'virtualedit' is active.
(closes #10868)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 09 Aug 2022 15:30:03 +0200 |
| parents | d3904bdae951 |
| children | 51b072a13be4 |
| files | src/mouse.c src/testdir/test_virtualedit.vim src/version.c |
| diffstat | 3 files changed, 39 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mouse.c +++ b/src/mouse.c @@ -1967,7 +1967,8 @@ retnomove: // Only use ScreenCols[] after the window was redrawn. Mainly matters // for tests, a user would not click before redrawing. - if (curwin->w_redr_type <= VALID_NO_UPDATE) + // Do not use when 'virtualedit' is active. + if (curwin->w_redr_type <= VALID_NO_UPDATE && !virtual_active()) col_from_screen = ScreenCols[off]; #ifdef FEAT_FOLDING // Remember the character under the mouse, it might be a '-' or '+' in
--- a/src/testdir/test_virtualedit.vim +++ b/src/testdir/test_virtualedit.vim @@ -537,4 +537,39 @@ func Test_global_local_virtualedit() set virtualedit& endfunc +func Test_virtualedit_mouse() + let save_mouse = &mouse + set mouse=a + set virtualedit=all + new + + call setline(1, ["text\tword"]) + redraw + call test_setmouse(1, 4) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 4, 0, 4], getcurpos()) + call test_setmouse(1, 5) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 5, 0, 5], getcurpos()) + call test_setmouse(1, 6) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 5, 1, 6], getcurpos()) + call test_setmouse(1, 7) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 5, 2, 7], getcurpos()) + call test_setmouse(1, 8) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 5, 3, 8], getcurpos()) + call test_setmouse(1, 9) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 6, 0, 9], getcurpos()) + call test_setmouse(1, 15) + call feedkeys("\<LeftMouse>", "xt") + call assert_equal([0, 1, 10, 2, 15], getcurpos()) + + bwipe! + let &mouse = save_mouse + set virtualedit& +endfunc + " vim: shiftwidth=2 sts=2 expandtab