mirror of
https://github.com/neovim/neovim.git
synced 2024-12-24 13:15:09 -07:00
vim-patch:9.0.0738: cannot suppress completion "scanning" messages (#20633)
Problem: Cannot suppress completion "scanning" messages.
Solution: Add the "C" flag in 'shortmess'. (Bjorn Linse, closes vim/vim#11354)
91ccbad5de
This commit is contained in:
parent
4fbf41dfb4
commit
06dfedc87a
@ -5557,6 +5557,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
c don't give |ins-completion-menu| messages. For example,
|
c don't give |ins-completion-menu| messages. For example,
|
||||||
"-- XXX completion (YYY)", "match 1 of 2", "The only match",
|
"-- XXX completion (YYY)", "match 1 of 2", "The only match",
|
||||||
"Pattern not found", "Back at original", etc.
|
"Pattern not found", "Back at original", etc.
|
||||||
|
C don't give messages while scanning for ins-completion items,
|
||||||
|
for instance "scanning tags"
|
||||||
q use "recording" instead of "recording @a"
|
q use "recording" instead of "recording @a"
|
||||||
F don't give the file info when editing a file, like `:silent`
|
F don't give the file info when editing a file, like `:silent`
|
||||||
was used for the command
|
was used for the command
|
||||||
|
@ -1433,7 +1433,7 @@ static void ins_compl_files(int count, char **files, int thesaurus, int flags, r
|
|||||||
|
|
||||||
for (i = 0; i < count && !got_int && !compl_interrupted; i++) {
|
for (i = 0; i < count && !got_int && !compl_interrupted; i++) {
|
||||||
fp = os_fopen(files[i], "r"); // open dictionary file
|
fp = os_fopen(files[i], "r"); // open dictionary file
|
||||||
if (flags != DICT_EXACT) {
|
if (flags != DICT_EXACT && !shortmess(SHM_COMPLETIONSCAN)) {
|
||||||
msg_hist_off = true; // reset in msg_trunc_attr()
|
msg_hist_off = true; // reset in msg_trunc_attr()
|
||||||
vim_snprintf((char *)IObuff, IOSIZE,
|
vim_snprintf((char *)IObuff, IOSIZE,
|
||||||
_("Scanning dictionary: %s"), files[i]);
|
_("Scanning dictionary: %s"), files[i]);
|
||||||
@ -2759,14 +2759,16 @@ static int process_next_cpt_value(ins_compl_next_state_T *st, int *compl_type_ar
|
|||||||
st->dict = (char_u *)st->ins_buf->b_fname;
|
st->dict = (char_u *)st->ins_buf->b_fname;
|
||||||
st->dict_f = DICT_EXACT;
|
st->dict_f = DICT_EXACT;
|
||||||
}
|
}
|
||||||
msg_hist_off = true; // reset in msg_trunc_attr()
|
if (!shortmess(SHM_COMPLETIONSCAN)) {
|
||||||
vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"),
|
msg_hist_off = true; // reset in msg_trunc_attr()
|
||||||
st->ins_buf->b_fname == NULL
|
vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"),
|
||||||
? buf_spname(st->ins_buf)
|
st->ins_buf->b_fname == NULL
|
||||||
: st->ins_buf->b_sfname == NULL
|
? buf_spname(st->ins_buf)
|
||||||
? st->ins_buf->b_fname
|
: st->ins_buf->b_sfname == NULL
|
||||||
: st->ins_buf->b_sfname);
|
? st->ins_buf->b_fname
|
||||||
(void)msg_trunc_attr((char *)IObuff, true, HL_ATTR(HLF_R));
|
: st->ins_buf->b_sfname);
|
||||||
|
(void)msg_trunc_attr((char *)IObuff, true, HL_ATTR(HLF_R));
|
||||||
|
}
|
||||||
} else if (*st->e_cpt == NUL) {
|
} else if (*st->e_cpt == NUL) {
|
||||||
status = INS_COMPL_CPT_END;
|
status = INS_COMPL_CPT_END;
|
||||||
} else {
|
} else {
|
||||||
@ -2787,10 +2789,12 @@ static int process_next_cpt_value(ins_compl_next_state_T *st, int *compl_type_ar
|
|||||||
} else if (*st->e_cpt == 'd') {
|
} else if (*st->e_cpt == 'd') {
|
||||||
compl_type = CTRL_X_PATH_DEFINES;
|
compl_type = CTRL_X_PATH_DEFINES;
|
||||||
} else if (*st->e_cpt == ']' || *st->e_cpt == 't') {
|
} else if (*st->e_cpt == ']' || *st->e_cpt == 't') {
|
||||||
msg_hist_off = true; // reset in msg_trunc_attr()
|
|
||||||
compl_type = CTRL_X_TAGS;
|
compl_type = CTRL_X_TAGS;
|
||||||
vim_snprintf((char *)IObuff, IOSIZE, "%s", _("Scanning tags."));
|
if (!shortmess(SHM_COMPLETIONSCAN)) {
|
||||||
(void)msg_trunc_attr((char *)IObuff, true, HL_ATTR(HLF_R));
|
msg_hist_off = true; // reset in msg_trunc_attr()
|
||||||
|
vim_snprintf((char *)IObuff, IOSIZE, "%s", _("Scanning tags."));
|
||||||
|
(void)msg_trunc_attr((char *)IObuff, true, HL_ATTR(HLF_R));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
compl_type = -1;
|
compl_type = -1;
|
||||||
}
|
}
|
||||||
|
@ -239,7 +239,7 @@ enum {
|
|||||||
SHM_MOD = 'm', ///< Modified.
|
SHM_MOD = 'm', ///< Modified.
|
||||||
SHM_FILE = 'f', ///< (file 1 of 2)
|
SHM_FILE = 'f', ///< (file 1 of 2)
|
||||||
SHM_LAST = 'i', ///< Last line incomplete.
|
SHM_LAST = 'i', ///< Last line incomplete.
|
||||||
SHM_TEXT = 'x', ///< Tx instead of textmode.
|
SHM_TEXT = 'x', ///< tx instead of textmode.
|
||||||
SHM_LINES = 'l', ///< "L" instead of "lines".
|
SHM_LINES = 'l', ///< "L" instead of "lines".
|
||||||
SHM_NEW = 'n', ///< "[New]" instead of "[New file]".
|
SHM_NEW = 'n', ///< "[New]" instead of "[New file]".
|
||||||
SHM_WRI = 'w', ///< "[w]" instead of "written".
|
SHM_WRI = 'w', ///< "[w]" instead of "written".
|
||||||
@ -253,9 +253,10 @@ enum {
|
|||||||
SHM_ATTENTION = 'A', ///< No ATTENTION messages.
|
SHM_ATTENTION = 'A', ///< No ATTENTION messages.
|
||||||
SHM_INTRO = 'I', ///< Intro messages.
|
SHM_INTRO = 'I', ///< Intro messages.
|
||||||
SHM_COMPLETIONMENU = 'c', ///< Completion menu messages.
|
SHM_COMPLETIONMENU = 'c', ///< Completion menu messages.
|
||||||
|
SHM_COMPLETIONSCAN = 'C', ///< Completion scanning messages.
|
||||||
SHM_RECORDING = 'q', ///< Short recording message.
|
SHM_RECORDING = 'q', ///< Short recording message.
|
||||||
SHM_FILEINFO = 'F', ///< No file info messages.
|
SHM_FILEINFO = 'F', ///< No file info messages.
|
||||||
SHM_SEARCHCOUNT = 'S', ///< Search sats: '[1/10]'
|
SHM_SEARCHCOUNT = 'S', ///< Search stats: '[1/10]'
|
||||||
};
|
};
|
||||||
/// Represented by 'a' flag.
|
/// Represented by 'a' flag.
|
||||||
#define SHM_ALL_ABBREVIATIONS ((char[]) { \
|
#define SHM_ALL_ABBREVIATIONS ((char[]) { \
|
||||||
|
@ -118,7 +118,8 @@ static char *(p_rdb_values[]) = { "compositor", "nothrottle", "invalid", "nodelt
|
|||||||
static char SHM_ALL[] = { SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW,
|
static char SHM_ALL[] = { SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW,
|
||||||
SHM_WRI, SHM_ABBREVIATIONS, SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL,
|
SHM_WRI, SHM_ABBREVIATIONS, SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL,
|
||||||
SHM_OVER, SHM_OVERALL, SHM_SEARCH, SHM_ATTENTION, SHM_INTRO,
|
SHM_OVER, SHM_OVERALL, SHM_SEARCH, SHM_ATTENTION, SHM_INTRO,
|
||||||
SHM_COMPLETIONMENU, SHM_RECORDING, SHM_FILEINFO, SHM_SEARCHCOUNT, 0, };
|
SHM_COMPLETIONMENU, SHM_COMPLETIONSCAN, SHM_RECORDING, SHM_FILEINFO,
|
||||||
|
SHM_SEARCHCOUNT, 0, };
|
||||||
|
|
||||||
/// After setting various option values: recompute variables that depend on
|
/// After setting various option values: recompute variables that depend on
|
||||||
/// option values.
|
/// option values.
|
||||||
|
Loading…
Reference in New Issue
Block a user