GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1539: completion: messages don't respect 'shm' setting (#34923)

Browse Source 
Problem:  completion: messages don't respect 'shm' setting
Solution: Turn off completion messages when 'shortmess' includes "c"
          (Girish Palya).

`:set shortmess+=c` is intended to reduce noise during completion by
suppressing messages.
Previously, some completion messages still appeared regardless of this setting.

This change ensures that **all** completion-related messages are suppressed
when `'c'` is present in `'shortmess'`.

Not entirely sure if the original behavior was intentional. If there's a
reason certain messages were always shown, feel free to close this without
merging.

closes: vim/vim#17737

fe1d3c8af7

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2025-07-14 06:53:40 +08:00
committed by GitHub
parent 96ec4db3e9
commit f487ae90cf
3 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/insexpand.c
View File

@ -5632,7 +5632,9 @@ static int ins_compl_start(void)
}
if (compl_status_adding()) {
edit_submode_pre = _(" Adding");
if (!shortmess(SHM_COMPLETIONMENU)) {
edit_submode_pre = _(" Adding");
}
if (ctrl_x_mode_line_or_eval()) {
// Insert a new line, keep indentation but ignore 'comments'.
char *old = curbuf->b_p_com;
@ -5654,10 +5656,12 @@ static int ins_compl_start(void)
compl_startpos.col = compl_col;
}
if (compl_cont_status & CONT_LOCAL) {
edit_submode = _(ctrl_x_msgs[CTRL_X_LOCAL_MSG]);
} else {
edit_submode = _(CTRL_X_MSG(ctrl_x_mode));
if (!shortmess(SHM_COMPLETIONMENU)) {
if (compl_cont_status & CONT_LOCAL) {
edit_submode = _(ctrl_x_msgs[CTRL_X_LOCAL_MSG]);
} else {
edit_submode = _(CTRL_X_MSG(ctrl_x_mode));
}
}
// If any of the original typed text has been changed we need to fix
@ -5685,11 +5689,13 @@ static int ins_compl_start(void)
// showmode might reset the internal line pointers, so it must
// be called before line = ml_get(), or when this address is no
// longer needed. -- Acevedo.
edit_submode_extra = _("-- Searching...");
edit_submode_highl = HLF_COUNT;
showmode();
edit_submode_extra = NULL;
ui_flush();
if (!shortmess(SHM_COMPLETIONMENU)) {
edit_submode_extra = _("-- Searching...");
edit_submode_highl = HLF_COUNT;
showmode();
edit_submode_extra = NULL;
ui_flush();
}
return OK;
}
@ -5822,7 +5828,9 @@ int ins_complete(int c, bool enable_pum)
compl_cont_status &= ~CONT_S_IPOS;
}
ins_compl_show_statusmsg();
if (!shortmess(SHM_COMPLETIONMENU)) {
ins_compl_show_statusmsg();
}
// Show the popup menu, unless we got interrupted.
if (enable_pum && !compl_interrupted) {