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

fix(api): nvim_parse_cmd "range" when ea.addr_count=0 #33536

Browse Source 
Problem:
nvim_parse_cmd returns invalid 'range' field for cmd like `:bdelete`.

Solution:
Add the condtion `ea.add_count > 0` as required to put 'range'
into result.

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
Au.
2025-04-23 22:56:17 +08:00
committed by GitHub
parent bc814cfb2c
commit 652c3e76c7
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/api/command.c
View File

@@ -154,14 +154,12 @@ Dict(cmd) nvim_parse_cmd(String str, Dict(empty) *opts, Arena *arena, Error *err
char *name = (cmd != NULL ? cmd->uc_name : get_command_name(NULL, ea.cmdidx)); char *name = (cmd != NULL ? cmd->uc_name : get_command_name(NULL, ea.cmdidx));
PUT_KEY(result, cmd, cmd, cstr_as_string(name)); PUT_KEY(result, cmd, cmd, cstr_as_string(name));
if (ea.argt & EX_RANGE) { if ((ea.argt & EX_RANGE) && ea.addr_count > 0) {
Array range = arena_array(arena, 2); Array range = arena_array(arena, 2);
if (ea.addr_count > 0) { if (ea.addr_count > 1) {
if (ea.addr_count > 1) { ADD_C(range, INTEGER_OBJ(ea.line1));
ADD_C(range, INTEGER_OBJ(ea.line1));
}
ADD_C(range, INTEGER_OBJ(ea.line2));
} }
ADD_C(range, INTEGER_OBJ(ea.line2));
PUT_KEY(result, cmd, range, range); PUT_KEY(result, cmd, range, range);
} }

8
test/functional/api/vim_spec.lua
View File

@@ -4307,7 +4307,6 @@ describe('API', function()
cmd = 'put', cmd = 'put',
args = {}, args = {},
bang = false, bang = false,
range = {},
reg = '+', reg = '+',
addr = 'line', addr = 'line',
magic = { magic = {
@@ -4346,7 +4345,6 @@ describe('API', function()
cmd = 'put', cmd = 'put',
args = {}, args = {},
bang = false, bang = false,
range = {},
reg = '', reg = '',
addr = 'line', addr = 'line',
magic = { magic = {
@@ -4429,7 +4427,6 @@ describe('API', function()
cmd = 'write', cmd = 'write',
args = {}, args = {},
bang = true, bang = true,
range = {},
addr = 'line', addr = 'line',
magic = { magic = {
file = true, file = true,
@@ -4470,7 +4467,6 @@ describe('API', function()
cmd = 'split', cmd = 'split',
args = { 'foo.txt' }, args = { 'foo.txt' },
bang = false, bang = false,
range = {},
addr = '?', addr = '?',
magic = { magic = {
file = true, file = true,
@@ -4514,7 +4510,6 @@ describe('API', function()
cmd = 'split', cmd = 'split',
args = { 'foo.txt' }, args = { 'foo.txt' },
bang = false, bang = false,
range = {},
addr = '?', addr = '?',
magic = { magic = {
file = true, file = true,
@@ -4600,7 +4595,6 @@ describe('API', function()
cmd = 'argadd', cmd = 'argadd',
args = { 'a.txt' }, args = { 'a.txt' },
bang = false, bang = false,
range = {},
addr = 'arg', addr = 'arg',
magic = { magic = {
file = true, file = true,
@@ -4775,6 +4769,8 @@ describe('API', function()
eq('foo', api.nvim_cmd(api.nvim_parse_cmd('echo "foo"', {}), { output = true })) eq('foo', api.nvim_cmd(api.nvim_parse_cmd('echo "foo"', {}), { output = true }))
api.nvim_cmd(api.nvim_parse_cmd('set cursorline', {}), {}) api.nvim_cmd(api.nvim_parse_cmd('set cursorline', {}), {})
eq(true, api.nvim_get_option_value('cursorline', {})) eq(true, api.nvim_get_option_value('cursorline', {}))
-- Roundtrip on :bdelete which does not accept "range". #33394
api.nvim_cmd(api.nvim_parse_cmd('bdelete', {}), {})
end) end)
it('no side-effects (error messages) in pcall() #20339', function() it('no side-effects (error messages) in pcall() #20339', function()
eq( eq(