patch 9.1.1132: Mark positions wrong after triggering multiline completion
Problem: Mark positions wrong after triggering multiline completion.
Solution: Call deleted_lines_mark() after deleting lines.
(zeertzjq)
closes: #16687
Co-authored-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/insexpand.c b/src/insexpand.c
index 624165a..dc8c76b 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -4429,6 +4429,7 @@
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 0b94371..c34f642 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -3182,4 +3182,48 @@
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
diff --git a/src/version.c b/src/version.c
index 8e338f7..d09ba28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1132,
+/**/
1131,
/**/
1130,