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

fix(cmdline): avoid empty @: register after :<CR> (#33126)

Browse Source 
Fix https://github.com/neovim/neovim/issues/33125

(cherry picked from commit f4ee0ab2f1)
This commit is contained in:
luukvbaal
2025-03-28 19:48:17 +01:00
committed by github-actions[bot]
parent a9afa6b152
commit 06df3e0c0d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/ex_docmd.c
View File

@ -407,6 +407,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
int count = 0; // line number count
bool did_inc = false; // incremented RedrawingDisabled
int block_indent = -1; // indent for ext_cmdline block event
char *block_line = NULL; // block_line for ext_cmdline block event
int retval = OK;
cstack_T cstack = { // conditional stack
.cs_idx = -1,
@ -577,8 +578,9 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
int indent = cstack.cs_idx < 0 ? 0 : (cstack.cs_idx + 1) * 2;
if (count >= 1 && getline_equal(fgetline, cookie, getexline)) {
if (ui_has(kUICmdline)) {
char *line = last_cmdline ? last_cmdline : "";
char *line = block_line == last_cmdline ? "" : last_cmdline;
ui_ext_cmdline_block_append((size_t)MAX(0, block_indent), line);
block_line = last_cmdline;
block_indent = indent;
} else if (count == 1) {
// Need to set msg_didout for the first line after an ":if",
@ -684,7 +686,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
// If the command was typed, remember it for the ':' register.
// Do this AFTER executing the command to make :@: work.
if (getline_equal(fgetline, cookie, getexline)) {
if (getline_equal(fgetline, cookie, getexline) && new_last_cmdline != NULL) {
xfree(last_cmdline);
last_cmdline = new_last_cmdline;
new_last_cmdline = NULL;

1
test/functional/ui/cmdline_spec.lua
View File

@ -900,6 +900,7 @@ local function test_cmdline(linegrid)
cmdline_block = { { { 'if 1' } }, { { ' let x = 1' } } },
})
feed('<CR>')
eq('let x = 1', eval('@:'))
screen:expect({
grid = s1,
cmdline = {