mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-01 05:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0040: completion: preinsert wrong with register completion (#38003)

Browse Source 
Problem:  completion: preinsert wrong with register completion
Solution: Remove preinserted text during register content insertion
          (Girish Palya).

fixes:  vim/vim#19329
closes: vim/vim#19474

3684ad83d1

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2026-02-22 08:13:15 +08:00
committed by GitHub
parent 940d5c239b
commit 3f4ef487da
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/register.c
View File

@@ -23,6 +23,7 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/indent.h" #include "nvim/indent.h"
#include "nvim/insexpand.h"
#include "nvim/keycodes.h" #include "nvim/keycodes.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
@@ -1301,6 +1302,11 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
const pos_T orig_end = curbuf->b_op_end; const pos_T orig_end = curbuf->b_op_end;
unsigned cur_ve_flags = get_ve_flags(curwin); unsigned cur_ve_flags = get_ve_flags(curwin);
// Remove any preinserted text (issue vim/vim#19329)
if (ins_compl_preinsert_effect()) {
ins_compl_delete(false);
}
curbuf->b_op_start = curwin->w_cursor; // default for '[ mark curbuf->b_op_start = curwin->w_cursor; // default for '[ mark
curbuf->b_op_end = curwin->w_cursor; // default for '] mark curbuf->b_op_end = curwin->w_cursor; // default for '] mark

22
test/old/testdir/test_ins_complete.vim
View File

@@ -6378,4 +6378,26 @@ func Test_autocomplete_preinsert_null_leader()
delfunc GetState delfunc GetState
endfunc endfunc
" Issue #19329: When register contents are inserted, remove preinserted text
func Test_ins_register_preinsert_autocomplete()
func TestOmni(findstart, base)
if a:findstart
return col(".") - 1
endif
return ["foo", "foobar"]
endfunc
call Ntest_override("char_avail", 1)
new
set omnifunc=TestOmni complete^=o
set completeopt=preinsert autocomplete
call feedkeys("ifoo \<C-R>\<C-P>=\"xyz\"\<CR>\<Esc>", 'tx')
call assert_equal("foo xyz", getline('.'))
bw!
set omnifunc& complete& completeopt& autocomplete&
call Ntest_override("char_avail", 0)
delfunc TestOmni
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable " vim: shiftwidth=2 sts=2 expandtab nofoldenable