IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3433: :delcommand does not take a -buffer option

Browse Source 
Problem:    :delcommand does not take a -buffer option.
Solution:   Add the -buffer option.
bdcba24d85
This commit is contained in:
Sean Dewar 2022-01-29 17:00:37 +00:00
parent a28a9aec63
commit f8f0f14db2
No known key found for this signature in database
GPG Key ID: 08CC2C83AD41B581
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/map.txt
View File

@ -1241,6 +1241,10 @@ See |:verbose-cmd| for more information.
:delc[ommand] {cmd} *:delc* *:delcommand* *E184*
Delete the user-defined command {cmd}.
:delc[ommand] -buffer {cmd} *E1237*
Delete the user-defined command {cmd} that was defined
for the current buffer.
:comc[lear] *:comc* *:comclear*
Delete all user-defined commands.

26
src/nvim/ex_docmd.c
View File

@ -78,6 +78,10 @@
#include "nvim/vim.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_in_current_buffer_str
= N_("E1237: No such user-defined command in current buffer: %s");
static int quitmore = 0;
static bool ex_pressedreturn = false;
@ -5737,26 +5741,36 @@ static void ex_delcommand(exarg_T *eap)
{
int i = 0;
ucmd_T *cmd = NULL;
int cmp = -1;
int res = -1;
garray_T *gap;
const char_u *arg = eap->arg;
bool buffer_only = false;
if (STRNCMP(arg, "-buffer", 7) == 0 && ascii_iswhite(arg[7])) {
buffer_only = true;
arg = skipwhite(arg + 7);
}
gap = &curbuf->b_ucmds;
for (;;) {
for (i = 0; i < gap->ga_len; i++) {
cmd = USER_CMD_GA(gap, i);
cmp = STRCMP(eap->arg, cmd->uc_name);
if (cmp <= 0) {
res = STRCMP(arg, cmd->uc_name);
if (res <= 0) {
break;
}
}
if (gap == &ucmds || cmp == 0) {
if (gap == &ucmds || res == 0 || buffer_only) {
break;
}
gap = &ucmds;
}
if (cmp != 0) {
semsg(_("E184: No such user-defined command: %s"), eap->arg);
if (res != 0) {
semsg(_(buffer_only
? e_no_such_user_defined_command_in_current_buffer_str
: e_no_such_user_defined_command_str),
arg);
return;
}

23
src/nvim/testdir/test_usercommands.vim
View File

@ -551,3 +551,26 @@ func Test_command_list()
call assert_equal("\nNo user-defined commands found", execute(':command Xxx'))
call assert_equal("\nNo user-defined commands found", execute('command'))
endfunc
func Test_delcommand_buffer()
command Global echo 'global'
command -buffer OneBuffer echo 'one'
new
command -buffer TwoBuffer echo 'two'
call assert_equal(0, exists(':OneBuffer'))
call assert_equal(2, exists(':Global'))
call assert_equal(2, exists(':TwoBuffer'))
delcommand -buffer TwoBuffer
call assert_equal(0, exists(':TwoBuffer'))
call assert_fails('delcommand -buffer Global', 'E1237:')
call assert_fails('delcommand -buffer OneBuffer', 'E1237:')
bwipe!
call assert_equal(2, exists(':OneBuffer'))
delcommand -buffer OneBuffer
call assert_equal(0, exists(':OneBuffer'))
call assert_fails('delcommand -buffer Global', 'E1237:')
delcommand Global
call assert_equal(0, exists(':Global'))
endfunc
" vim: shiftwidth=2 sts=2 expandtab