From 69419f8b3e76363d44348ac64d6550e34725f6ea Mon Sep 17 00:00:00 2001 From: glepnir Date: Mon, 9 Mar 2026 19:58:13 +0800 Subject: [PATCH] fix(completion): CompleteDone reason="discard" when candidate text remains #38169 Problem: CompleteDone fires with reason="discard" even when the candidate text was inserted and left in the buffer, because reason was determined solely by the terminating keycode (Ctrl-Y). Solution: Check compl_used_match to detect whether inserted text remains in the buffer, and set reason="accept" accordingly. --- src/nvim/insexpand.c | 2 +- test/functional/autocmd/completedone_spec.lua | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 72dec5e428..2da7d777dd 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -650,7 +650,7 @@ static void do_autocmd_completedone(int c, int mode, char *word) tv_dict_add_str(v_event, S_LEN("complete_type"), mode_str != NULL ? mode_str : ""); tv_dict_add_str(v_event, S_LEN("reason"), - (c == Ctrl_Y ? "accept" : (c == Ctrl_E ? "cancel" : "discard"))); + (compl_used_match ? "accept" : (c == Ctrl_E ? "cancel" : "discard"))); tv_dict_set_keys_readonly(v_event); ins_apply_autocmds(EVENT_COMPLETEDONE); diff --git a/test/functional/autocmd/completedone_spec.lua b/test/functional/autocmd/completedone_spec.lua index cfc1963f8a..bd482c6a8a 100644 --- a/test/functional/autocmd/completedone_spec.lua +++ b/test/functional/autocmd/completedone_spec.lua @@ -13,6 +13,7 @@ describe('CompleteDone', function() describe('sets v:event.reason', function() before_each(function() + command('set completeopt+=noinsert') command('autocmd CompleteDone * let g:donereason = v:event.reason') feed('i') call('complete', call('col', '.'), { 'foo', 'bar' }) @@ -23,6 +24,19 @@ describe('CompleteDone', function() eq('accept', eval('g:donereason')) end) + it('accept when candidate is inserted without noinsert #38160', function() + command('set completeopt=menu,menuone') -- Omit "noinsert". + feed('Stest') + eq('accept', eval('g:donereason')) + eq('test', n.api.nvim_get_current_line()) + feed('Stipt') + eq('accept', eval('g:donereason')) + eq('tip', n.api.nvim_get_current_line()) + feed('Stryt') + eq('accept', eval('g:donereason')) + eq('try ', n.api.nvim_get_current_line()) + end) + it('cancel', function() feed('') eq('cancel', eval('g:donereason'))