mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.4186: cannot use an import in 'patchexpr'
Problem: Cannot use an import in 'patchexpr'. Solution: Set the script context when evaluating 'patchexpr'. Do not require 'patchexpr' to return a bool, it was ignored anyway.
This commit is contained in:
@@ -443,15 +443,26 @@ eval_patch(
|
||||
char_u *difffile,
|
||||
char_u *outfile)
|
||||
{
|
||||
int err;
|
||||
sctx_T saved_sctx = current_sctx;
|
||||
sctx_T *ctx;
|
||||
typval_T *tv;
|
||||
|
||||
set_vim_var_string(VV_FNAME_IN, origfile, -1);
|
||||
set_vim_var_string(VV_FNAME_DIFF, difffile, -1);
|
||||
set_vim_var_string(VV_FNAME_OUT, outfile, -1);
|
||||
(void)eval_to_bool(p_pex, &err, NULL, FALSE);
|
||||
|
||||
ctx = get_option_sctx("patchexpr");
|
||||
if (ctx != NULL)
|
||||
current_sctx = *ctx;
|
||||
|
||||
// errors are ignored
|
||||
tv = eval_expr(p_pex, NULL);
|
||||
free_tv(tv);
|
||||
|
||||
set_vim_var_string(VV_FNAME_IN, NULL, -1);
|
||||
set_vim_var_string(VV_FNAME_DIFF, NULL, -1);
|
||||
set_vim_var_string(VV_FNAME_OUT, NULL, -1);
|
||||
current_sctx = saved_sctx;
|
||||
}
|
||||
# endif
|
||||
|
||||
|
@@ -759,6 +759,36 @@ def Run_Test_import_in_diffexpr()
|
||||
bwipe!
|
||||
enddef
|
||||
|
||||
def Test_import_in_patchexpr()
|
||||
var lines =<< trim END
|
||||
vim9script
|
||||
export def TPatch()
|
||||
call writefile(['output file'], v:fname_out)
|
||||
enddef
|
||||
END
|
||||
writefile(lines, 'Xpatchexpr')
|
||||
|
||||
lines =<< trim END
|
||||
vim9script
|
||||
import './Xpatchexpr' as patch
|
||||
set patchexpr=patch.TPatch()
|
||||
END
|
||||
CheckScriptSuccess(lines)
|
||||
|
||||
call writefile(['input file'], 'Xinput')
|
||||
call writefile(['diff file'], 'Xdiff')
|
||||
:%bwipe!
|
||||
edit Xinput
|
||||
diffpatch Xdiff
|
||||
call assert_equal('output file', getline(1))
|
||||
|
||||
call delete('Xinput')
|
||||
call delete('Xdiff')
|
||||
call delete('Xpatchexpr')
|
||||
set patchexpr&
|
||||
:%bwipe!
|
||||
enddef
|
||||
|
||||
def Test_import_in_formatexpr()
|
||||
var lines =<< trim END
|
||||
vim9script
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
4186,
|
||||
/**/
|
||||
4185,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user