mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-22 11:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2130: Insert mode completion messages end up in message history

Browse Source 
Problem:    Insert mode completion messages end up in message history.
Solution:   Set msg_hist_off. (closes vim/vim#7452
cc2335896b
This commit is contained in:
Jan Edmund Lazo
2020-12-12 09:52:23 -05:00
parent 257c0f89a9
commit 7bbe8a4900
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/edit.c
View File

@@ -2958,6 +2958,7 @@ static void ins_compl_files(int count, char_u **files, int thesaurus,
for (i = 0; i < count && !got_int && !compl_interrupted; i++) {
fp = os_fopen((char *)files[i], "r"); // open dictionary file
if (flags != DICT_EXACT) {
msg_hist_off = true; // reset in msg_trunc_attr()
vim_snprintf((char *)IObuff, IOSIZE,
_("Scanning dictionary: %s"), (char *)files[i]);
(void)msg_trunc_attr(IObuff, true, HL_ATTR(HLF_R));
@@ -4113,6 +4114,7 @@ static int ins_compl_get_exp(pos_T *ini)
dict = ins_buf->b_fname;
dict_f = DICT_EXACT;
}
msg_hist_off = true; // reset in msg_trunc_attr()
vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"),
ins_buf->b_fname == NULL
? buf_spname(ins_buf)
@@ -4134,11 +4136,12 @@ static int ins_compl_get_exp(pos_T *ini)
dict = e_cpt;
dict_f = DICT_FIRST;
}
} else if (*e_cpt == 'i')
} else if (*e_cpt == 'i') {
type = CTRL_X_PATH_PATTERNS;
else if (*e_cpt == 'd')
} else if (*e_cpt == 'd') {
type = CTRL_X_PATH_DEFINES;
else if (*e_cpt == ']' || *e_cpt == 't') {
} else if (*e_cpt == ']' || *e_cpt == 't') {
msg_hist_off = true; // reset in msg_trunc_attr()
type = CTRL_X_TAGS;
vim_snprintf((char *)IObuff, IOSIZE, "%s", _("Scanning tags."));
(void)msg_trunc_attr(IObuff, true, HL_ATTR(HLF_R));
@@ -4721,9 +4724,11 @@ ins_compl_next (
MB_PTR_ADV(s);
}
}
msg_hist_off = true;
vim_snprintf((char *)IObuff, IOSIZE, "%s %s%s", lead,
s > compl_shown_match->cp_fname ? "<" : "", s);
msg(IObuff);
msg_hist_off = false;
redraw_cmdline = false; // don't overwrite!
}
}
@@ -5333,9 +5338,11 @@ static int ins_complete(int c, bool enable_pum)
if (!shortmess(SHM_COMPLETIONMENU)) {
if (edit_submode_extra != NULL) {
if (!p_smd) {
msg_hist_off = true;
msg_attr((const char *)edit_submode_extra,
(edit_submode_highl < HLF_COUNT
? HL_ATTR(edit_submode_highl) : 0));
msg_hist_off = false;
}
} else {
msg_clr_cmdline(); // necessary for "noshowmode"

16
src/nvim/testdir/test_ins_complete.vim
View File

@@ -280,7 +280,7 @@ func Test_omni_dash()
set omnifunc=Omni
new
exe "normal Gofind -\<C-x>\<C-o>"
call assert_equal("\n-\nmatch 1 of 2", execute(':2mess'))
call assert_equal("find -help", getline('$'))
bwipe!
delfunc Omni
@@ -468,3 +468,17 @@ func Test_pum_with_folds_two_tabs()
call StopVimInTerminal(buf)
call delete('Xpumscript')
endfunc
" Test to ensure 'Scanning...' messages are not recorded in messages history
func Test_z1_complete_no_history()
new
messages clear
let currmess = execute('messages')
setlocal dictionary=README.txt
exe "normal owh\<C-X>\<C-K>"
exe "normal owh\<C-N>"
call assert_equal(currmess, execute('messages'))
close!
endfunc
" vim: shiftwidth=2 sts=2 expandtab