mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1670: completion: autocomplete breaks second completion

Browse Source 
Problem:  completion: autocomplete breaks second completion
          (gravndal)
Solution: Fix the autocomplete bug (Girish Palya)

fixes: vim/vim#18044
closes: vim/vim#18068

b4e0bd93a9

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2025-08-23 20:20:43 +08:00
parent 1c0465bec6
commit 963ead29d9
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/edit.c
View File

@@ -581,10 +581,6 @@ static int insert_execute(VimState *state, int key)
return 1; // continue return 1; // continue
} }
if (p_ac) {
ins_compl_set_autocomplete(true);
}
// A non-white character that fits in with the current // A non-white character that fits in with the current
// completion: Add to "compl_leader". // completion: Add to "compl_leader".
if (ins_compl_accept_char(s->c)) { if (ins_compl_accept_char(s->c)) {
@@ -602,10 +598,6 @@ static int insert_execute(VimState *state, int key)
return 1; // continue return 1; // continue
} }
if (p_ac) {
ins_compl_set_autocomplete(false);
}
// Pressing CTRL-Y selects the current match. When // Pressing CTRL-Y selects the current match. When
// compl_enter_selects is set the Enter key does the same. // compl_enter_selects is set the Enter key does the same.
if ((s->c == Ctrl_Y if ((s->c == Ctrl_Y
@@ -861,7 +853,7 @@ static int insert_handle_key(InsertState *s)
redraw_later(curwin, UPD_VALID); redraw_later(curwin, UPD_VALID);
update_screen(); // Show char deletion immediately update_screen(); // Show char deletion immediately
ui_flush(); ui_flush();
ins_compl_set_autocomplete(true); ins_compl_enable_autocomplete();
insert_do_complete(s); // Trigger autocompletion insert_do_complete(s); // Trigger autocompletion
return 1; return 1;
} }
@@ -1246,7 +1238,7 @@ normalchar:
redraw_later(curwin, UPD_VALID); redraw_later(curwin, UPD_VALID);
update_screen(); // Show character immediately update_screen(); // Show character immediately
ui_flush(); ui_flush();
ins_compl_set_autocomplete(true); ins_compl_enable_autocomplete();
insert_do_complete(s); insert_do_complete(s);
} }

19
src/nvim/insexpand.c
View File

@@ -6022,21 +6022,23 @@ static void ins_compl_show_statusmsg(void)
/// Returns OK if completion was done, FAIL if something failed. /// Returns OK if completion was done, FAIL if something failed.
int ins_complete(int c, bool enable_pum) int ins_complete(int c, bool enable_pum)
{ {
const bool disable_ac_delay = compl_started && ctrl_x_mode_normal()
&& (c == Ctrl_N || c == Ctrl_P || c == Ctrl_R
|| ins_compl_pum_key(c));
compl_direction = ins_compl_key2dir(c); compl_direction = ins_compl_key2dir(c);
int insert_match = ins_compl_use_match(c); int insert_match = ins_compl_use_match(c);
if (!compl_started) { if (!compl_started) {
if (ins_compl_start() == FAIL) { if (ins_compl_start() == FAIL) {
compl_autocomplete = false;
return FAIL; return FAIL;
} }
} else if (insert_match && stop_arrow() == FAIL) { } else if (insert_match && stop_arrow() == FAIL) {
return FAIL; return FAIL;
} }
// Timestamp when match collection starts uint64_t compl_start_tv = 0; ///< Time when match collection starts
uint64_t compl_start_tv = 0; if (compl_autocomplete && p_acl > 0 && !disable_ac_delay) {
if (compl_autocomplete && p_acl > 0) {
compl_start_tv = os_hrtime(); compl_start_tv = os_hrtime();
} }
compl_curr_win = curwin; compl_curr_win = curwin;
@@ -6089,7 +6091,7 @@ int ins_complete(int c, bool enable_pum)
} }
// Wait for the autocompletion delay to expire // Wait for the autocompletion delay to expire
if (compl_autocomplete && p_acl > 0 && !no_matches_found if (compl_autocomplete && p_acl > 0 && !disable_ac_delay && !no_matches_found
&& (os_hrtime() - compl_start_tv) / 1000000 < (uint64_t)p_acl) { && (os_hrtime() - compl_start_tv) / 1000000 < (uint64_t)p_acl) {
setcursor(); setcursor();
ui_flush(); ui_flush();
@@ -6110,15 +6112,14 @@ int ins_complete(int c, bool enable_pum)
} }
compl_was_interrupted = compl_interrupted; compl_was_interrupted = compl_interrupted;
compl_interrupted = false; compl_interrupted = false;
compl_autocomplete = false;
return OK; return OK;
} }
/// Enable/disable autocompletion /// Enable autocompletion
void ins_compl_set_autocomplete(bool value) void ins_compl_enable_autocomplete(void)
{ {
compl_autocomplete = value; compl_autocomplete = true;
} }
/// Remove (if needed) and show the popup menu /// Remove (if needed) and show the popup menu

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

@@ -5471,7 +5471,7 @@ func Test_autocomplete_timer()
call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word')) call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word'))
call assert_equal(0, b:selected) call assert_equal(0, b:selected)
call assert_equal(1, g:CallCount) call assert_equal(1, g:CallCount)
call assert_equal('ab', getline(4)) call assert_equal('abc', getline(4))
set completeopt& set completeopt&
" Test 8: {func} completes after space, but not '.' " Test 8: {func} completes after space, but not '.'