aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.1850: Vim9: wrong line number where options set

Browse Source 
Problem:  Vim9: wrong line number where options set
Solution: Set source line number earlier

closes: #13006
closes: #13013

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
This commit is contained in:
LemonBoy
2023-09-02 21:52:05 +02:00
committed by Christian Brabandt
parent c8a034210f
commit 32f3461465
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/testdir/test_vim9_script.vim
View File

@@ -4332,6 +4332,23 @@ def Test_option_set()
set foldlevel& set foldlevel&
enddef enddef
def Test_option_set_line_number()
var lines =<< trim END
vim9script
# line2
# line3
def F()
# line5
&foldlevel = -128
enddef
F()
END
v9.CheckScriptSuccess(lines)
var res = execute('verbose set foldlevel')
assert_match(' foldlevel.*Last set from .*XScriptSuccess\d\+ line 6', res)
enddef
def Test_option_modifier() def Test_option_modifier()
# legacy script allows for white space # legacy script allows for white space
var lines =<< trim END var lines =<< trim END

2
src/version.c
View File

@@ -699,6 +699,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 */
/**/
1850,
/**/ /**/
1849, 1849,
/**/ /**/

2
src/vim9execute.c
View File

@@ -3836,6 +3836,7 @@ exec_instructions(ectx_T *ectx)
char_u *tofree = NULL; char_u *tofree = NULL;
--ectx->ec_stack.ga_len; --ectx->ec_stack.ga_len;
SOURCING_LNUM = iptr->isn_lnum;
tv = STACK_TV_BOT(0); tv = STACK_TV_BOT(0);
if (tv->v_type == VAR_STRING) if (tv->v_type == VAR_STRING)
{ {
@@ -3845,7 +3846,6 @@ exec_instructions(ectx_T *ectx)
} }
else if (iptr->isn_type == ISN_STOREFUNCOPT) else if (iptr->isn_type == ISN_STOREFUNCOPT)
{ {
SOURCING_LNUM = iptr->isn_lnum;
// If the option can be set to a function reference or // If the option can be set to a function reference or
// a lambda and the passed value is a function // a lambda and the passed value is a function
// reference, then convert it to the name (string) of // reference, then convert it to the name (string) of