kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5022: 'completefunc'/'omnifunc' error does not end completion (#19083)

Browse Source 
Problem:    'completefunc'/'omnifunc' error does not end completion.
Solution:   Check if there was an error or exception. (closes vim/vim#10486,
            closes vim/vim#4218)
9bcb9ca9c7
This commit is contained in:
zeertzjq 2022-06-25 18:38:35 +08:00 committed by GitHub
parent 5c2c88717a
commit a5175fe489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/edit.c
View File

@ -5263,12 +5263,13 @@ static int ins_complete(int c, bool enable_pum)
return FAIL;
}
/* Return value -2 means the user complete function wants to
* cancel the complete without an error.
* Return value -3 does the same as -2 and leaves CTRL-X mode.*/
if (col == -2) {
// Return value -2 means the user complete function wants to cancel the
// complete without an error, do the same if the function did not execute
// successfully.
if (col == -2 || aborting()) {
return FAIL;
}
// Return value -3 does the same as -2 and leaves CTRL-X mode.
if (col == -3) {
ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL;

24
src/nvim/testdir/test_ins_complete.vim
View File

@ -287,6 +287,30 @@ func Test_omni_dash()
set omnifunc=
endfunc
func Test_omni_throw()
let g:CallCount = 0
func Omni(findstart, base)
let g:CallCount += 1
if a:findstart
throw "he he he"
endif
endfunc
set omnifunc=Omni
new
try
exe "normal ifoo\<C-x>\<C-o>"
call assert_false(v:true, 'command should have failed')
catch
call assert_exception('he he he')
call assert_equal(1, g:CallCount)
endtry
bwipe!
delfunc Omni
unlet g:CallCount
set omnifunc=
endfunc
func Test_completefunc_args()
let s:args = []
func! CompleteFunc(findstart, base)