aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 8.2.2992: Vim9: completion for :disassemble is incomplete

Browse Source 
Problem:    Vim9: completion for :disassemble is incomplete.
Solution:   Recognize the "debug" and "profile" arguments.
This commit is contained in:
Bram Moolenaar 2021-06-13 18:38:48 +02:00
parent e70e12b32f
commit 4ee9d8e04d
6 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmdexpand.c
View File

@ -1557,10 +1557,12 @@ set_one_cmd_context(
case CMD_function:
case CMD_delfunction:
case CMD_disassemble:
xp->xp_context = EXPAND_USER_FUNC;
xp->xp_pattern = arg;
break;
case CMD_disassemble:
set_context_in_disassemble_cmd(xp, arg);
break;
case CMD_echohl:
set_context_in_echohl_cmd(xp, arg);
@ -2120,6 +2122,7 @@ ExpandFromContext(
{EXPAND_USER_VARS, get_user_var_name, FALSE, TRUE},
{EXPAND_FUNCTIONS, get_function_name, FALSE, TRUE},
{EXPAND_USER_FUNC, get_user_func_name, FALSE, TRUE},
{EXPAND_DISASSEMBLE, get_disassemble_argument, FALSE, TRUE},
{EXPAND_EXPRESSION, get_expr_name, FALSE, TRUE},
# endif
# ifdef FEAT_MENU

2
src/proto/vim9execute.pro
View File

@ -7,6 +7,8 @@ int fill_partial_and_closure(partial_T *pt, ufunc_T *ufunc, ectx_T *ectx);
int exe_typval_instr(typval_T *tv, typval_T *rettv);
char_u *exe_substitute_instr(void);
int call_def_function(ufunc_T *ufunc, int argc_arg, typval_T *argv, partial_T *partial, typval_T *rettv);
void set_context_in_disassemble_cmd(expand_T *xp, char_u *arg);
char_u *get_disassemble_argument(expand_T *xp, int idx);
void ex_disassemble(exarg_T *eap);
int tv2bool(typval_T *tv);
void emsg_using_string_as(typval_T *tv, int as_number);

10
src/testdir/test_cmdline.vim
View File

@ -810,6 +810,16 @@ func Test_cmdline_complete_various()
call feedkeys(":legac call strle\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"legac call strlen(", @:)
" completion for the :disassemble command
call feedkeys(":disas deb\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"disas debug", @:)
call feedkeys(":disas pro\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"disas profile", @:)
call feedkeys(":disas debug Test_cmdline_complete_var\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"disas debug Test_cmdline_complete_various", @:)
call feedkeys(":disas profile Test_cmdline_complete_var\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"disas profile Test_cmdline_complete_various", @:)
" completion for the :match command
call feedkeys(":match Search /pat/\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"match Search /pat/\<C-A>", @:)

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2992,
/**/
2991,
/**/

1
src/vim.h
View File

@ -777,6 +777,7 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring);
#define EXPAND_MAPCLEAR 47
#define EXPAND_ARGLIST 48
#define EXPAND_DIFF_BUFFERS 49
#define EXPAND_DISASSEMBLE 50
// Values for exmode_active (0 is no exmode)
#define EXMODE_NORMAL 1

34
src/vim9execute.c
View File

@ -5370,6 +5370,40 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
}
}
/*
* Handle command line completion for the :disassemble command.
*/
void
set_context_in_disassemble_cmd(expand_T *xp, char_u *arg)
{
char_u *p;
// Default: expand user functions, "debug" and "profile"
xp->xp_context = EXPAND_DISASSEMBLE;
xp->xp_pattern = arg;
// first argument already typed: only user function names
if (*arg != NUL && *(p = skiptowhite(arg)) != NUL)
{
xp->xp_context = EXPAND_USER_FUNC;
xp->xp_pattern = skipwhite(p);
}
}
/*
* Function given to ExpandGeneric() to obtain the list of :disassemble
* arguments.
*/
char_u *
get_disassemble_argument(expand_T *xp, int idx)
{
if (idx == 0)
return (char_u *)"debug";
if (idx == 1)
return (char_u *)"profile";
return get_user_func_name(xp, idx - 2);
}
/*
* ":disassemble".
* We don't really need this at runtime, but we do have tests that require it,