mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: 'showcmd' with ext_messages and Visual selection (#28393)

Browse Source 
Also slightly reorder some code to make comments look less out-of-place.
This commit is contained in:
zeertzjq
2024-04-18 08:33:08 +08:00
committed by GitHub
parent 562719033e
commit e1ca7a7bfc
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/normal.c
View File

@@ -893,8 +893,8 @@ static bool normal_get_command_count(NormalState *s)
// Handle a count before a command and compute ca.count0.
// Note that '0' is a command and not the start of a count, but it's
// part of a count after other digits.
while ((s->c >= '1' && s->c <= '9') || (s->ca.count0 != 0
&& (s->c == K_DEL || s->c == K_KDEL || s->c == '0'))) {
while ((s->c >= '1' && s->c <= '9')
|| (s->ca.count0 != 0 && (s->c == K_DEL || s->c == K_KDEL || s->c == '0'))) {
if (s->c == K_DEL || s->c == K_KDEL) {
s->ca.count0 /= 10;
del_from_showcmd(4); // delete the digit and ~@%
@@ -2065,9 +2065,6 @@ static void display_showcmd(void)
return;
}
// 'showcmdloc' is "last" or empty
if (p_ch == 0 && !ui_has(kUIMessages)) {
return;
}
if (ui_has(kUIMessages)) {
MAXSIZE_TEMP_ARRAY(content, 1);
@@ -2081,6 +2078,9 @@ static void display_showcmd(void)
ui_call_msg_showcmd(content);
return;
}
if (p_ch == 0) {
return;
}
msg_grid_validate();
int showcmd_row = Rows - 1;