vim-patch:9.1.1132: Mark positions wrong after triggering multiline completion (#32564)

Problem:  Mark positions wrong after triggering multiline completion.
Solution: Call deleted_lines_mark() after deleting lines.
          (zeertzjq)

closes: vim/vim#16687

060e6556e2

Co-authored-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
This commit is contained in:
zeertzjq
2025-02-22 07:07:47 +08:00
committed by GitHub
parent f3f94d2c37
commit 59b672fda2
2 changed files with 45 additions and 0 deletions

View File

@@ -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

View File

@@ -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