mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 9.1.0991: v:stacktrace has wrong type in Vim9 script
Problem: v:stacktrace has wrong type in Vim9 script. Solution: Change the type to t_list_dict_any. Fix grammar in docs. (zeertzjq) closes: #16390 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
cf1f55548d
commit
6655bef330
@@ -1,4 +1,4 @@
|
|||||||
*builtin.txt* For Vim version 9.1. Last change: 2025 Jan 05
|
*builtin.txt* For Vim version 9.1. Last change: 2025 Jan 06
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -5002,12 +5002,12 @@ getstacktrace() *getstacktrace()*
|
|||||||
Returns the current stack trace of Vim scripts.
|
Returns the current stack trace of Vim scripts.
|
||||||
Stack trace is a |List|, of which each item is a |Dictionary|
|
Stack trace is a |List|, of which each item is a |Dictionary|
|
||||||
with the following items:
|
with the following items:
|
||||||
funcref The funcref if the stack is at the function,
|
funcref The funcref if the stack is at a function,
|
||||||
otherwise this item is not exist.
|
otherwise this item is omitted.
|
||||||
event The string of the event description if the
|
event The string of the event description if the
|
||||||
stack is at autocmd event, otherwise this item
|
stack is at an autocmd event, otherwise this
|
||||||
is not exist.
|
item is omitted.
|
||||||
lnum The line number of the script on the stack.
|
lnum The line number in the script on the stack.
|
||||||
filepath The file path of the script on the stack.
|
filepath The file path of the script on the stack.
|
||||||
|
|
||||||
Return type: list<dict<any>>
|
Return type: list<dict<any>>
|
||||||
|
@@ -161,7 +161,7 @@ static struct vimvar
|
|||||||
{VV_NAME("t_typealias", VAR_NUMBER), NULL, VV_RO},
|
{VV_NAME("t_typealias", VAR_NUMBER), NULL, VV_RO},
|
||||||
{VV_NAME("t_enum", VAR_NUMBER), NULL, VV_RO},
|
{VV_NAME("t_enum", VAR_NUMBER), NULL, VV_RO},
|
||||||
{VV_NAME("t_enumvalue", VAR_NUMBER), NULL, VV_RO},
|
{VV_NAME("t_enumvalue", VAR_NUMBER), NULL, VV_RO},
|
||||||
{VV_NAME("stacktrace", VAR_LIST), &t_list_string, VV_RO},
|
{VV_NAME("stacktrace", VAR_LIST), &t_list_dict_any, VV_RO},
|
||||||
};
|
};
|
||||||
|
|
||||||
// shorthand
|
// shorthand
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
" Test for getstacktrace() and v:stacktrace
|
" Test for getstacktrace() and v:stacktrace
|
||||||
|
|
||||||
|
import './vim9.vim' as v9
|
||||||
|
|
||||||
let s:thisfile = expand('%:p')
|
let s:thisfile = expand('%:p')
|
||||||
let s:testdir = s:thisfile->fnamemodify(':h')
|
let s:testdir = s:thisfile->fnamemodify(':h')
|
||||||
|
|
||||||
@@ -34,7 +36,7 @@ func Test_getstacktrace()
|
|||||||
source Xscript1
|
source Xscript1
|
||||||
call Xfunc1()
|
call Xfunc1()
|
||||||
call AssertStacktrace([
|
call AssertStacktrace([
|
||||||
\ #{funcref: funcref('Test_getstacktrace'), lnum: 35, filepath: s:thisfile},
|
\ #{funcref: funcref('Test_getstacktrace'), lnum: 37, filepath: s:thisfile},
|
||||||
\ #{funcref: funcref('Xfunc1'), lnum: 5, filepath: Filepath('Xscript1')},
|
\ #{funcref: funcref('Xfunc1'), lnum: 5, filepath: Filepath('Xscript1')},
|
||||||
\ #{funcref: funcref('Xfunc2'), lnum: 4, filepath: Filepath('Xscript2')},
|
\ #{funcref: funcref('Xfunc2'), lnum: 4, filepath: Filepath('Xscript2')},
|
||||||
\ ], g:stacktrace)
|
\ ], g:stacktrace)
|
||||||
@@ -61,7 +63,7 @@ func Test_getstacktrace_event()
|
|||||||
source Xscript1
|
source Xscript1
|
||||||
source Xscript2
|
source Xscript2
|
||||||
call AssertStacktrace([
|
call AssertStacktrace([
|
||||||
\ #{funcref: funcref('Test_getstacktrace_event'), lnum: 62, filepath: s:thisfile},
|
\ #{funcref: funcref('Test_getstacktrace_event'), lnum: 64, filepath: s:thisfile},
|
||||||
\ #{event: 'SourcePre Autocommands for "*"', lnum: 7, filepath: Filepath('Xscript1')},
|
\ #{event: 'SourcePre Autocommands for "*"', lnum: 7, filepath: Filepath('Xscript1')},
|
||||||
\ #{funcref: funcref('Xfunc'), lnum: 4, filepath: Filepath('Xscript1')},
|
\ #{funcref: funcref('Xfunc'), lnum: 4, filepath: Filepath('Xscript1')},
|
||||||
\ ], g:stacktrace)
|
\ ], g:stacktrace)
|
||||||
@@ -98,10 +100,33 @@ func Test_vstacktrace()
|
|||||||
endtry
|
endtry
|
||||||
call assert_equal([], v:stacktrace)
|
call assert_equal([], v:stacktrace)
|
||||||
call AssertStacktrace([
|
call AssertStacktrace([
|
||||||
\ #{funcref: funcref('Test_vstacktrace'), lnum: 95, filepath: s:thisfile},
|
\ #{funcref: funcref('Test_vstacktrace'), lnum: 97, filepath: s:thisfile},
|
||||||
\ #{funcref: funcref('Xfunc1'), lnum: 5, filepath: Filepath('Xscript1')},
|
\ #{funcref: funcref('Xfunc1'), lnum: 5, filepath: Filepath('Xscript1')},
|
||||||
\ #{funcref: funcref('Xfunc2'), lnum: 4, filepath: Filepath('Xscript2')},
|
\ #{funcref: funcref('Xfunc2'), lnum: 4, filepath: Filepath('Xscript2')},
|
||||||
\ ], stacktrace)
|
\ ], stacktrace)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_zzz_stacktrace_vim9()
|
||||||
|
let lines =<< trim [SCRIPT]
|
||||||
|
var stacktrace = getstacktrace()
|
||||||
|
assert_notequal([], stacktrace)
|
||||||
|
for d in stacktrace
|
||||||
|
assert_true(has_key(d, 'lnum'))
|
||||||
|
endfor
|
||||||
|
try
|
||||||
|
throw 'Exception from s:Func'
|
||||||
|
catch
|
||||||
|
assert_notequal([], v:stacktrace)
|
||||||
|
assert_equal(len(stacktrace), len(v:stacktrace))
|
||||||
|
for d in v:stacktrace
|
||||||
|
assert_true(has_key(d, 'lnum'))
|
||||||
|
endfor
|
||||||
|
endtry
|
||||||
|
[SCRIPT]
|
||||||
|
call v9.CheckDefSuccess(lines)
|
||||||
|
" FIXME: v:stacktrace is not cleared after the exception handling, and this
|
||||||
|
" test has to be run as the last one because of this.
|
||||||
|
" call assert_equal([], v:stacktrace)
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
991,
|
||||||
/**/
|
/**/
|
||||||
990,
|
990,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user