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

fix(api): nvim_parse_cmd check for ambiguous user command (#19116)

Browse Source
This commit is contained in:
zeertzjq
2022-06-27 14:10:13 +08:00
committed by GitHub
parent e2f9d0332b
commit cf23695dd7
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/ex_docmd.c
View File

@@ -82,8 +82,13 @@
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/window.h" #include "nvim/window.h"
static char *e_no_such_user_defined_command_str = N_("E184: No such user-defined command: %s"); static char e_no_such_user_defined_command_str[]
static char *e_no_such_user_defined_command_in_current_buffer_str = N_("E184: No such user-defined command: %s");
static char e_ambiguous_use_of_user_defined_command[]
= N_("E464: Ambiguous use of user-defined command");
static char e_not_an_editor_command[]
= N_("E492: Not an editor command");
static char e_no_such_user_defined_command_in_current_buffer_str[]
= N_("E1237: No such user-defined command in current buffer: %s"); = N_("E1237: No such user-defined command in current buffer: %s");
static int quitmore = 0; static int quitmore = 0;
@@ -1439,6 +1444,10 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, char **er
eap->cmd = skipwhite(eap->cmd + 1); eap->cmd = skipwhite(eap->cmd + 1);
} }
p = find_ex_command(eap, NULL); p = find_ex_command(eap, NULL);
if (p == NULL) {
*errormsg = _(e_ambiguous_use_of_user_defined_command);
return false;
}
// Set command address type and parse command range // Set command address type and parse command range
set_cmd_addr_type(eap, (char_u *)p); set_cmd_addr_type(eap, (char_u *)p);
@@ -1455,7 +1464,7 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, char **er
} }
// Fail if command is invalid // Fail if command is invalid
if (eap->cmdidx == CMD_SIZE) { if (eap->cmdidx == CMD_SIZE) {
STRCPY(IObuff, _("E492: Not an editor command")); STRCPY(IObuff, _(e_not_an_editor_command));
// If the modifier was parsed OK the error must be in the following command // If the modifier was parsed OK the error must be in the following command
char *cmdname = after_modifier ? after_modifier : cmdline; char *cmdname = after_modifier ? after_modifier : cmdline;
append_command(cmdname); append_command(cmdname);
@@ -1886,14 +1895,14 @@ static char *do_one_cmd(char **cmdlinep, int flags, cstack_T *cstack, LineGetter
if (p == NULL) { if (p == NULL) {
if (!ea.skip) { if (!ea.skip) {
errormsg = _("E464: Ambiguous use of user-defined command"); errormsg = _(e_ambiguous_use_of_user_defined_command);
} }
goto doend; goto doend;
} }
// Check for wrong commands. // Check for wrong commands.
if (ea.cmdidx == CMD_SIZE) { if (ea.cmdidx == CMD_SIZE) {
if (!ea.skip) { if (!ea.skip) {
STRCPY(IObuff, _("E492: Not an editor command")); STRCPY(IObuff, _(e_not_an_editor_command));
// If the modifier was parsed OK the error must be in the following // If the modifier was parsed OK the error must be in the following
// command // command
char *cmdname = after_modifier ? after_modifier : *cmdlinep; char *cmdname = after_modifier ? after_modifier : *cmdlinep;

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

@@ -3520,6 +3520,9 @@ describe('API', function()
pcall_err(meths.parse_cmd, 'Fubar!', {})) pcall_err(meths.parse_cmd, 'Fubar!', {}))
eq('Error while parsing command line: E481: No range allowed', eq('Error while parsing command line: E481: No range allowed',
pcall_err(meths.parse_cmd, '4,6Fubar', {})) pcall_err(meths.parse_cmd, '4,6Fubar', {}))
command('command! Foobar echo foo')
eq('Error while parsing command line: E464: Ambiguous use of user-defined command',
pcall_err(meths.parse_cmd, 'F', {}))
end) end)
end) end)
describe('nvim_cmd', function() describe('nvim_cmd', function()