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 9.0.1431: getscriptinfo() loops even when specific SID is given

Browse Source 
Problem:    getscriptinfo() loops even when specific SID is given.
Solution:   Only loop when needed.  Give a clearer error message.
            (closes #12207)
This commit is contained in:
zeertzjq 2023-03-30 21:50:37 +01:00 committed by Bram Moolenaar
parent 6400203517
commit 2d68b722e3
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/scriptfile.c
View File

@ -1299,7 +1299,7 @@ ex_options(
* ":source" and associated commands.
*/
#ifdef FEAT_EVAL
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return the address holding the next breakpoint line for a source cookie.
*/
@ -2096,7 +2096,6 @@ get_script_local_funcs(scid_T sid)
void
f_getscriptinfo(typval_T *argvars, typval_T *rettv)
{
int i;
list_T *l;
char_u *pat = NULL;
regmatch_T regmatch;
@ -2116,8 +2115,22 @@ f_getscriptinfo(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type == VAR_DICT)
{
sid = dict_get_number_def(argvars[0].vval.v_dict, "sid", -1);
if (sid == -1)
dictitem_T *sid_di = dict_find(argvars[0].vval.v_dict,
(char_u *)"sid", 3);
if (sid_di != NULL)
{
int error = FALSE;
sid = tv_get_number_chk(&sid_di->di_tv, &error);
if (error)
return;
if (sid <= 0)
{
semsg(e_invalid_value_for_argument_str_str, "sid",
tv_get_string(&sid_di->di_tv));
return;
}
}
else
{
pat = dict_get_string(argvars[0].vval.v_dict, "name", TRUE);
if (pat != NULL)
@ -2127,7 +2140,8 @@ f_getscriptinfo(typval_T *argvars, typval_T *rettv)
}
}
for (i = 1; i <= script_items.ga_len; ++i)
for (varnumber_T i = sid > 0 ? sid : 1;
(i == sid || sid <= 0) && i <= script_items.ga_len; ++i)
{
scriptitem_T *si = SCRIPT_ITEM(i);
dict_T *d;
@ -2138,9 +2152,6 @@ f_getscriptinfo(typval_T *argvars, typval_T *rettv)
if (filterpat && !vim_regexec(&regmatch, si->sn_name, (colnr_T)0))
continue;
if (sid != -1 && sid != i)
continue;
if ((d = dict_alloc()) == NULL
|| list_append_dict(l, d) == FAIL
|| dict_add_string(d, "name", si->sn_name) == FAIL
@ -2151,10 +2162,9 @@ f_getscriptinfo(typval_T *argvars, typval_T *rettv)
si->sn_state == SN_STATE_NOT_LOADED) == FAIL)
return;
// When a filter pattern is specified to return information about only
// specific script(s), also add the script-local variables and
// functions.
if (sid != -1)
// When a script ID is specified, return information about only the
// specified script, and add the script-local variables and functions.
if (sid > 0)
{
dict_T *var_dict;

10
src/testdir/test_scriptnames.vim
View File

@ -91,6 +91,16 @@ func Test_getscriptinfo()
call assert_fails("echo getscriptinfo('foobar')", 'E1206:')
call assert_fails("echo getscriptinfo({'sid': []})", 'E745:')
call assert_fails("echo getscriptinfo({'sid': {}})", 'E728:')
call assert_fails("echo getscriptinfo({'sid': 0})", 'E475:')
call assert_fails("echo getscriptinfo({'sid': -1})", 'E475:')
call assert_fails("echo getscriptinfo({'sid': -999})", 'E475:')
echo getscriptinfo({'sid': '1'})
call assert_fails("vim9cmd echo getscriptinfo({'sid': '1'})", 'E1030:')
let max_sid = max(map(getscriptinfo(), { k, v -> v.sid }))
call assert_equal([], getscriptinfo({'sid': max_sid + 1}))
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

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