From 55dc482e757e1d8f7713daa61a2deddfdaca4e42 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 31 Aug 2024 04:03:30 +0800 Subject: fix(completion): fix inconsistent Enter behavior (#30196) Problem: Behavior of Enter in completion depends on typing speed. Solution: Don't make whether Enter selects original text depend on whether completion has been interrupted, which can happen interactively with a slow completion function. --- src/nvim/insexpand.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/nvim') diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index dd014879eb..1522aeeb75 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -1792,6 +1792,13 @@ int ins_compl_bs(void) return NUL; } +/// Check if the complete function returned "always" in the "refresh" dictionary item. +static bool ins_compl_refresh_always(void) + FUNC_ATTR_PURE +{ + return (ctrl_x_mode_function() || ctrl_x_mode_omni()) && compl_opt_refresh_always; +} + /// Check that we need to find matches again, ins_compl_restart() is to /// be called. static bool ins_compl_need_restart(void) @@ -1799,9 +1806,7 @@ static bool ins_compl_need_restart(void) { // Return true if we didn't complete finding matches or when the // "completefunc" returned "always" in the "refresh" dictionary item. - return compl_was_interrupted - || ((ctrl_x_mode_function() || ctrl_x_mode_omni()) - && compl_opt_refresh_always); + return compl_was_interrupted || ins_compl_refresh_always(); } /// Called after changing "compl_leader". @@ -1834,7 +1839,7 @@ static void ins_compl_new_leader(void) // Don't let Enter select the original text when there is no popup menu. // Don't let Enter select when use user function and refresh_always is set - if (compl_match_array == NULL || ins_compl_need_restart()) { + if (compl_match_array == NULL || ins_compl_refresh_always()) { compl_enter_selects = false; } } -- cgit