mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(messages): capture execute("messages") with ext_messages (#34342)

Browse Source 
Problem:  "msg_history_show" event is emitted when `msg_silent > 0`.
          E.g. when capturing its output with `execute()`, which also
          doesn't work with ext_messages.
Solution: Don't emit the "msg_history_show" event when `msg_silent > 0`.
          Call regular messaging functions when `redirecting()`, to
          execute `redir_write()` while ensuring the message itself
          is not emitted.
This commit is contained in:
luukvbaal
2025-06-06 16:45:30 +02:00
committed by GitHub
parent 3b6084ddf4
commit bf1d4e9793
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/message.c
View File

@@ -1187,10 +1187,12 @@ void ex_messages(exarg_T *eap)
Array entries = ARRAY_DICT_INIT;
MessageHistoryEntry *p = eap->skip ? msg_hist_temp : msg_hist_first;
int skip = eap->addr_count ? (msg_hist_len - eap->line2) : 0;
while (p != NULL) {
for (; p != NULL; p = p->next) {
// Skip over count or temporary "g<" messages.
if ((p->temp && !eap->skip) || skip-- > 0) {
// Skipping over count or temporary "g<" messages.
} else if (ui_has(kUIMessages)) {
continue;
}
if (ui_has(kUIMessages) && !msg_silent) {
Array entry = ARRAY_DICT_INIT;
ADD(entry, CSTR_TO_OBJ(p->kind));
Array content = ARRAY_DICT_INIT;
@@ -1204,10 +1206,12 @@ void ex_messages(exarg_T *eap)
}
ADD(entry, ARRAY_OBJ(content));
ADD(entries, ARRAY_OBJ(entry));
} else {
msg_multihl(p->msg, p->kind, false, false);
}
p = p->next;
if (redirecting() || !ui_has(kUIMessages)) {
msg_silent += ui_has(kUIMessages);
msg_multihl(p->msg, p->kind, false, false);
msg_silent -= ui_has(kUIMessages);
}
}
if (kv_size(entries) > 0) {
ui_call_msg_history_show(entries);