mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18457 from famiu/feat/api/nvim_parse_cmd

Browse Source 
fix(api): make `nvim_parse_cmd` work correctly with both range and count
This commit is contained in:
bfredl
2022-05-07 09:46:06 +02:00
committed by GitHub
parent cd8edb551b 14f3383c0d
commit 6c39f9d427
4 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/api/vimscript.c
View File

@@ -752,7 +752,7 @@ Dictionary nvim_parse_expression(String expr, String flags, Boolean highlight, E
/// no range was specified, one element if only a single range item was
/// specified and two elements if both range items were specified.
/// - count: (number) Any |<count>| that was supplied to the command. -1 if command cannot
/// take a count. Mutually exclusive with "range".
/// take a count.
/// - reg: (number) The optional command |<register>|, if specified. Empty string if not
/// specified or if command cannot take a register.
/// - bang: (boolean) Whether command contains a |<bang>| (!) modifier.
@@ -853,7 +853,7 @@ Dictionary nvim_parse_cmd(String str, Dictionary opts, Error *err)
PUT(result, "cmd", CSTR_TO_OBJ((char *)get_command_name(NULL, ea.cmdidx)));
}
if ((ea.argt & EX_RANGE) && !(ea.argt & EX_COUNT) && ea.addr_count > 0) {
if ((ea.argt & EX_RANGE) && ea.addr_count > 0) {
Array range = ARRAY_DICT_INIT;
if (ea.addr_count > 1) {
ADD(range, INTEGER_OBJ(ea.line1));

10
src/nvim/ex_docmd.c
View File

@@ -1320,7 +1320,7 @@ static void parse_register(exarg_T *eap)
}
}
static int parse_count(exarg_T *eap, char **errormsg)
static int parse_count(exarg_T *eap, char **errormsg, bool validate)
{
// Check for a count. When accepting a EX_BUFNAME, don't use "123foo" as a
// count, it's a buffer name.
@@ -1348,7 +1348,7 @@ static int parse_count(exarg_T *eap, char **errormsg)
eap->line2 += n - 1;
eap->addr_count++;
// Be vi compatible: no error message for out of range.
if (eap->line2 > curbuf->b_ml.ml_line_count) {
if (validate && eap->line2 > curbuf->b_ml.ml_line_count) {
eap->line2 = curbuf->b_ml.ml_line_count;
}
}
@@ -1426,7 +1426,7 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, char **er
}
p = find_command(eap, NULL);
// Set command attribute type and parse command range
// Set command address type and parse command range
set_cmd_addr_type(eap, (char_u *)p);
eap->cmd = cmd;
if (parse_cmd_address(eap, errormsg, false) == FAIL) {
@@ -1499,7 +1499,7 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, char **er
// Parse register and count
parse_register(eap);
if (parse_count(eap, errormsg) == FAIL) {
if (parse_count(eap, errormsg, false) == FAIL) {
return false;
}
@@ -1981,7 +1981,7 @@ static char *do_one_cmd(char **cmdlinep, int flags, cstack_T *cstack, LineGetter
// Parse register and count
parse_register(&ea);
if (parse_count(&ea, &errormsg) == FAIL) {
if (parse_count(&ea, &errormsg, true) == FAIL) {
goto doend;
}