mirror of
https://github.com/vim/vim.git
synced 2025-10-01 04:54:07 -04:00
patch 9.0.0244: cannot easily get the list of sourced scripts
Problem: Cannot easily get the list of sourced scripts. Solution: Add the getscriptinfo() function. (Yegappan Lakshmanan, closes #10957)
This commit is contained in:
committed by
Bram Moolenaar
parent
e89aeed43e
commit
f768c3d19c
@@ -1935,6 +1935,8 @@ static funcentry_T global_functions[] =
|
||||
ret_dict_any, f_getreginfo},
|
||||
{"getregtype", 0, 1, FEARG_1, arg1_string,
|
||||
ret_string, f_getregtype},
|
||||
{"getscriptinfo", 0, 0, 0, NULL,
|
||||
ret_list_dict_any, f_getscriptinfo},
|
||||
{"gettabinfo", 0, 1, FEARG_1, arg1_number,
|
||||
ret_list_dict_any, f_gettabinfo},
|
||||
{"gettabvar", 2, 3, FEARG_1, arg3_number_string_any,
|
||||
|
@@ -33,6 +33,7 @@ char_u *get_scriptname(scid_T id);
|
||||
void free_scriptnames(void);
|
||||
void free_autoload_scriptnames(void);
|
||||
linenr_T get_sourced_lnum(char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie);
|
||||
void f_getscriptinfo(typval_T *argvars, typval_T *rettv);
|
||||
char_u *getsourceline(int c, void *cookie, int indent, getline_opt_T options);
|
||||
int sourcing_a_script(exarg_T *eap);
|
||||
void ex_scriptencoding(exarg_T *eap);
|
||||
|
@@ -1933,6 +1933,36 @@ get_sourced_lnum(
|
||||
? ((source_cookie_T *)cookie)->sourcing_lnum
|
||||
: SOURCING_LNUM;
|
||||
}
|
||||
|
||||
void
|
||||
f_getscriptinfo(typval_T *argvars UNUSED, typval_T *rettv)
|
||||
{
|
||||
int i;
|
||||
list_T *l;
|
||||
|
||||
if (rettv_list_alloc(rettv) == FAIL)
|
||||
return;
|
||||
|
||||
l = rettv->vval.v_list;
|
||||
|
||||
for (i = 1; i <= script_items.ga_len; ++i)
|
||||
{
|
||||
scriptitem_T *si = SCRIPT_ITEM(i);
|
||||
dict_T *d;
|
||||
|
||||
if (si->sn_name == NULL)
|
||||
continue;
|
||||
|
||||
if ((d = dict_alloc()) == NULL
|
||||
|| list_append_dict(l, d) == FAIL
|
||||
|| dict_add_string(d, "name", si->sn_name) == FAIL
|
||||
|| dict_add_number(d, "sid", i) == FAIL
|
||||
|| dict_add_bool(d, "autoload",
|
||||
si->sn_state == SN_STATE_NOT_LOADED) == FAIL)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static char_u *
|
||||
|
@@ -1,5 +1,5 @@
|
||||
" Test for :scriptnames
|
||||
|
||||
" Test for the :scriptnames command
|
||||
func Test_scriptnames()
|
||||
call writefile(['let did_load_script = 123'], 'Xscripting')
|
||||
source Xscripting
|
||||
@@ -29,4 +29,14 @@ func Test_scriptnames()
|
||||
call assert_equal(msgs, execute('messages'))
|
||||
endfunc
|
||||
|
||||
" Test for the getscriptinfo() function
|
||||
func Test_getscriptinfo()
|
||||
call writefile(['let loaded_script_id = expand("<SID>")'], 'Xscript')
|
||||
source Xscript
|
||||
let l = getscriptinfo()
|
||||
call assert_match('Xscript$', l[-1].name)
|
||||
call assert_equal(g:loaded_script_id, $"<SNR>{l[-1].sid}_")
|
||||
call delete('Xscript')
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@@ -732,6 +732,8 @@ def Test_use_relative_autoload_import_in_mapping()
|
||||
|
||||
source Xmapscript.vim
|
||||
assert_match('\d\+ A: .*XrelautoloadExport.vim', execute('scriptnames')->split("\n")[-1])
|
||||
assert_match('XrelautoloadExport.vim$', getscriptinfo()[-1].name)
|
||||
assert_true(getscriptinfo()[-1].autoload)
|
||||
feedkeys("\<F3>", "xt")
|
||||
assert_equal(42, g:result)
|
||||
|
||||
|
@@ -731,6 +731,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
244,
|
||||
/**/
|
||||
243,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user