patch 9.0.0269: getscriptinfo() does not include the version
Problem: getscriptinfo() does not include the version. Cannot select
entries by script name.
Solution: Add the "version" item and the "name" argument. (Yegappan
Lakshmanan, closes #10962)
diff --git a/src/testdir/test_scriptnames.vim b/src/testdir/test_scriptnames.vim
index 06ae305..2d8ee61 100644
--- a/src/testdir/test_scriptnames.vim
+++ b/src/testdir/test_scriptnames.vim
@@ -31,12 +31,34 @@
" Test for the getscriptinfo() function
func Test_getscriptinfo()
- call writefile(['let loaded_script_id = expand("<SID>")'], 'Xscript')
- source Xscript
+ let lines =<< trim END
+ let g:loaded_script_id = expand("<SID>")
+ let s:XscriptVar = [1, #{v: 2}]
+ func s:XscriptFunc()
+ endfunc
+ END
+ call writefile(lines, 'X22script91')
+ source X22script91
let l = getscriptinfo()
- call assert_match('Xscript$', l[-1].name)
+ call assert_match('X22script91$', l[-1].name)
call assert_equal(g:loaded_script_id, $"<SNR>{l[-1].sid}_")
- call delete('Xscript')
+
+ let l = getscriptinfo({'name': '22script91'})
+ call assert_equal(1, len(l))
+ call assert_match('22script91$', l[0].name)
+
+ let l = getscriptinfo({'name': 'foobar'})
+ call assert_equal(0, len(l))
+ let l = getscriptinfo({'name': ''})
+ call assert_true(len(l) > 1)
+
+ call assert_fails("echo getscriptinfo({'name': []})", 'E730:')
+ call assert_fails("echo getscriptinfo({'name': '\\@'})", 'E866:')
+ let l = getscriptinfo({'name': test_null_string()})
+ call assert_true(len(l) > 1)
+ call assert_fails("echo getscriptinfo('foobar')", 'E1206:')
+
+ call delete('X22script91')
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 7aa81bc..931fe67 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1896,6 +1896,10 @@
getregtype('')->assert_equal("\<C-V>4")
enddef
+def Test_getscriptinfo()
+ v9.CheckDefAndScriptFailure(['getscriptinfo("x")'], ['E1013: Argument 1: type mismatch, expected dict<any> but got string', 'E1206: Dictionary required for argument 1'])
+enddef
+
def Test_gettabinfo()
v9.CheckDefAndScriptFailure(['gettabinfo("x")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1210: Number required for argument 1'])
enddef
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index d9b40d6..832fad8 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -732,10 +732,15 @@
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)
+ var l = getscriptinfo()
+ assert_match('XrelautoloadExport.vim$', l[-1].name)
+ assert_true(l[-1].autoload)
feedkeys("\<F3>", "xt")
assert_equal(42, g:result)
+ l = getscriptinfo({name: 'XrelautoloadExport'})
+ assert_true(len(l) == 1)
+ assert_match('XrelautoloadExport.vim$', l[0].name)
+ assert_false(l[0].autoload)
unlet g:result
delete('XrelautoloadExport.vim')