diff options
| -rw-r--r-- | src/nvim/insexpand.c | 1 | ||||
| -rw-r--r-- | test/old/testdir/test_ins_complete.vim | 44 |
2 files changed, 45 insertions, 0 deletions
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index b0fa9146f1..e33e48e1d2 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -3795,6 +3795,7 @@ void ins_compl_delete(bool new_leader) } return; } + deleted_lines_mark(curwin->w_cursor.lnum, 1); curwin->w_cursor.lnum--; } // move cursor to end of line diff --git a/test/old/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim index a0570c7c5d..cf9c970a22 100644 --- a/test/old/testdir/test_ins_complete.vim +++ b/test/old/testdir/test_ins_complete.vim @@ -3121,4 +3121,48 @@ function Test_completeopt_preinsert() delfunc Omni_test endfunc +" Check that mark positions are correct after triggering multiline completion. +func Test_complete_multiline_marks() + func Omni_test(findstart, base) + if a:findstart + return col(".") + endif + return [ + \ #{word: "func ()\n\t\nend"}, + \ #{word: "foobar"}, + \ #{word: "你好\n\t\n我好"} + \ ] + endfunc + set omnifunc=Omni_test + + new + let lines = mapnew(range(10), 'string(v:val)') + call setline(1, lines) + call setpos("'a", [0, 3, 1, 0]) + + call feedkeys("A \<C-X>\<C-O>\<C-E>\<BS>", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \<C-X>\<C-O>\<C-N>\<C-E>\<BS>", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \<C-X>\<C-O>\<C-N>\<C-N>\<C-E>\<BS>", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \<C-X>\<C-O>\<C-N>\<C-N>\<C-N>\<C-E>\<BS>", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \<C-X>\<C-O>\<C-Y>", 'tx') + call assert_equal(['0 func ()', "\t", 'end'] + lines[1:], getline(1, '$')) + call assert_equal([0, 5, 1, 0], getpos("'a")) + + bw! + set omnifunc& + delfunc Omni_test +endfunc + " vim: shiftwidth=2 sts=2 expandtab nofoldenable |