diff --git a/src/insexpand.c b/src/insexpand.c index 624165a9b..dc8c76bee 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -4429,6 +4429,7 @@ ins_compl_delete(void) VIM_CLEAR(remaining); return; } + deleted_lines_mark(curwin->w_cursor.lnum, 1L); curwin->w_cursor.lnum--; } // move cursor to end of line diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 0b943712b..c34f6426e 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -3182,4 +3182,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 \\\\", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \\\\\", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \\\\\\", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \\\\\\\", 'tx') + call assert_equal(lines, getline(1, '$')) + call assert_equal([0, 3, 1, 0], getpos("'a")) + + call feedkeys("A \\\", '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 diff --git a/src/version.c b/src/version.c index 8e338f75f..d09ba285c 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1132, /**/ 1131, /**/