forked from aniani/vim
patch 8.2.4580: Vim9: incorrect error for shadowing variable
Problem: Vim9: incorrect error for shadowing variable. Solution: Do not pass the context when compiling a referenced function.
This commit is contained in:
@@ -2999,6 +2999,24 @@ def Test_lambda_arg_shadows_func()
|
|||||||
assert_equal([42], g:Shadowed())
|
assert_equal([42], g:Shadowed())
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Test_compiling_referenced_func_no_shadow()
|
||||||
|
var lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
|
||||||
|
def InitializeReply(lspserver: dict<any>)
|
||||||
|
enddef
|
||||||
|
|
||||||
|
def ProcessReply(lspserver: dict<any>)
|
||||||
|
var lsp_reply_handlers: dict<func> =
|
||||||
|
{ 'initialize': InitializeReply }
|
||||||
|
lsp_reply_handlers['initialize'](lspserver)
|
||||||
|
enddef
|
||||||
|
|
||||||
|
call ProcessReply({})
|
||||||
|
END
|
||||||
|
v9.CheckScriptSuccess(lines)
|
||||||
|
enddef
|
||||||
|
|
||||||
def s:Line_continuation_in_def(dir: string = ''): string
|
def s:Line_continuation_in_def(dir: string = ''): string
|
||||||
var path: string = empty(dir)
|
var path: string = empty(dir)
|
||||||
\ ? 'empty'
|
\ ? 'empty'
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
4580,
|
||||||
/**/
|
/**/
|
||||||
4579,
|
4579,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -364,7 +364,7 @@ generate_funcref(cctx_T *cctx, char_u *name, int has_g_prefix)
|
|||||||
// Need to compile any default values to get the argument types.
|
// Need to compile any default values to get the argument types.
|
||||||
compile_type = get_compile_type(ufunc);
|
compile_type = get_compile_type(ufunc);
|
||||||
if (func_needs_compiling(ufunc, compile_type)
|
if (func_needs_compiling(ufunc, compile_type)
|
||||||
&& compile_def_function(ufunc, TRUE, compile_type, cctx) == FAIL)
|
&& compile_def_function(ufunc, TRUE, compile_type, NULL) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type);
|
return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user