mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(insexpand): update showmode when updating the screen (#34466)

Browse Source 
Problem:  Eagerly calling `showmode()` to update showmode where setting
          `redraw_showmode` to be updated later would suffice.
Solution: Set `redraw_showmode` instead of calling `showmode()` if not
          showing a busy message followed by a `ui_flush()`.
This commit is contained in:
luukvbaal
2025-06-13 10:37:19 +02:00
committed by GitHub
parent 1ede826e04
commit 29c8dabd41
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/insexpand.c
View File

@@ -339,7 +339,7 @@ void ins_ctrl_x(void)
ctrl_x_mode = CTRL_X_NOT_DEFINED_YET; ctrl_x_mode = CTRL_X_NOT_DEFINED_YET;
edit_submode = _(CTRL_X_MSG(ctrl_x_mode)); edit_submode = _(CTRL_X_MSG(ctrl_x_mode));
edit_submode_pre = NULL; edit_submode_pre = NULL;
showmode(); redraw_mode = true;
} else { } else {
// CTRL-X in CTRL-X CTRL-V mode behaves differently to make CTRL-X // CTRL-X in CTRL-X CTRL-V mode behaves differently to make CTRL-X
// CTRL-V look like CTRL-N // CTRL-V look like CTRL-N
@@ -2290,7 +2290,7 @@ static bool set_ctrl_x_mode(const int c)
edit_submode = _(" (replace) Scroll (^E/^Y)"); edit_submode = _(" (replace) Scroll (^E/^Y)");
} }
edit_submode_pre = NULL; edit_submode_pre = NULL;
showmode(); redraw_mode = true;
break; break;
case Ctrl_L: case Ctrl_L:
// complete whole line // complete whole line
@@ -2354,7 +2354,7 @@ static bool set_ctrl_x_mode(const int c)
// stop completion // stop completion
ctrl_x_mode = CTRL_X_NORMAL; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
showmode(); redraw_mode = true;
retval = true; retval = true;
break; break;
case Ctrl_P: case Ctrl_P:
@@ -2392,7 +2392,7 @@ static bool set_ctrl_x_mode(const int c)
} }
ctrl_x_mode = CTRL_X_NORMAL; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
showmode(); redraw_mode = true;
break; break;
} }
@@ -2507,7 +2507,7 @@ static bool ins_compl_stop(const int c, const int prev_mode, bool retval)
compl_enter_selects = false; compl_enter_selects = false;
if (edit_submode != NULL) { if (edit_submode != NULL) {
edit_submode = NULL; edit_submode = NULL;
showmode(); redraw_mode = true;
} }
if (c == Ctrl_C && cmdwin_type != 0) { if (c == Ctrl_C && cmdwin_type != 0) {
@@ -2595,14 +2595,14 @@ bool ins_compl_prep(int c)
ctrl_x_mode = ctrl_x_mode_scroll() ? CTRL_X_NORMAL : CTRL_X_FINISHED; ctrl_x_mode = ctrl_x_mode_scroll() ? CTRL_X_NORMAL : CTRL_X_FINISHED;
edit_submode = NULL; edit_submode = NULL;
} }
showmode(); redraw_mode = true;
} }
if (compl_started || ctrl_x_mode == CTRL_X_FINISHED) { if (compl_started || ctrl_x_mode == CTRL_X_FINISHED) {
// Show error message from attempted keyword completion (probably // Show error message from attempted keyword completion (probably
// 'Pattern not found') until another key is hit, then go back to // 'Pattern not found') until another key is hit, then go back to
// showing what mode we are in. // showing what mode we are in.
showmode(); redraw_mode = true;
if ((ctrl_x_mode_normal() if ((ctrl_x_mode_normal()
&& c != Ctrl_N && c != Ctrl_N
&& c != Ctrl_P && c != Ctrl_P
@@ -5652,7 +5652,7 @@ static void ins_compl_show_statusmsg(void)
} }
// Show a message about what (completion) mode we're in. // Show a message about what (completion) mode we're in.
showmode(); redraw_mode = true;
if (!shortmess(SHM_COMPLETIONMENU)) { if (!shortmess(SHM_COMPLETIONMENU)) {
if (edit_submode_extra != NULL) { if (edit_submode_extra != NULL) {
if (!p_smd) { if (!p_smd) {