Mercurial > vim
changeset 22812:1ef3b04875ff v8.2.1954
patch 8.2.1954: Vim9: not all command modifiers are tested
Commit: https://github.com/vim/vim/commit/f65b35b4465d3622128bd82bd3775f833542eb1f
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 4 18:02:44 2020 +0100
patch 8.2.1954: Vim9: not all command modifiers are tested
Problem: Vim9: not all command modifiers are tested.
Solution: Add tests for "keep" modifiers. Fix that marks are lost even
though ":lockmarks" is used.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 04 Nov 2020 18:15:03 +0100 |
| parents | f2e4940ef271 |
| children | 3b2899c150d3 |
| files | src/ex_cmds.c src/testdir/test_vim9_cmd.vim src/version.c |
| diffstat | 3 files changed, 46 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1254,6 +1254,16 @@ do_filter( if (read_linecount >= linecount) // move all marks from old lines to new lines mark_adjust(line1, line2, linecount, 0L); + else if (save_cmod_flags & CMOD_LOCKMARKS) + { + // Move marks from the lines below the new lines down by + // the number of lines lost. + // Move marks from the lines that will be deleted to the + // new lines and below. + mark_adjust(line2 + 1, (linenr_T)MAXLNUM, + linecount - read_linecount, 0L); + mark_adjust(line1, line2, linecount, 0L); + } else { // move marks from old lines to new lines, delete marks
--- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -439,13 +439,42 @@ def Test_command_modifiers_keep() DoTest(false, true, true) DoTest(true, true, true) set cpo&vim + + new + setline(1, ['one', 'two', 'three', 'four']) + assert_equal(4, line("$")) + normal 1Gma + normal 2Gmb + normal 3Gmc + lockmarks :1,2!wc + # line is deleted, marks don't move + assert_equal(3, line("$")) + assert_equal('four', getline(3)) + assert_equal(1, line("'a")) + assert_equal(2, line("'b")) + assert_equal(3, line("'c")) + quit! endif - # TODO - # lockmarks - # keepalt - # keeppatterns - # keepjumps + edit Xone + edit Xtwo + assert_equal('Xone', expand('#')) + keepalt edit Xthree + assert_equal('Xone', expand('#')) + + normal /a*b* + assert_equal('a*b*', histget("search")) + keeppatterns normal /c*d* + assert_equal('a*b*', histget("search")) + + new + setline(1, range(10)) + :10 + normal gg + assert_equal(10, getpos("''")[1]) + keepjumps normal 5G + assert_equal(10, getpos("''")[1]) + quit! enddef def Test_command_modifier_other()