0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.4181: Vim9: cannot use an import in 'diffexpr'

Problem:    Vim9: cannot use an import in 'diffexpr'.
Solution:   Set the script context when evaluating 'diffexpr'.  Do not require
            'diffexpr' to return a bool, it was ignored anyway.
This commit is contained in:
Bram Moolenaar
2022-01-22 17:58:13 +00:00
parent 5600a709f4
commit 7b29f6a394
3 changed files with 58 additions and 2 deletions

View File

@@ -415,15 +415,26 @@ eval_diff(
char_u *newfile,
char_u *outfile)
{
int err = FALSE;
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_NEW, newfile, -1);
set_vim_var_string(VV_FNAME_OUT, outfile, -1);
(void)eval_to_bool(p_dex, &err, NULL, FALSE);
ctx = get_option_sctx("diffexpr");
if (ctx != NULL)
current_sctx = *ctx;
// errors are ignored
tv = eval_expr(p_dex, NULL);
clear_tv(tv);
set_vim_var_string(VV_FNAME_IN, NULL, -1);
set_vim_var_string(VV_FNAME_NEW, NULL, -1);
set_vim_var_string(VV_FNAME_OUT, NULL, -1);
current_sctx = saved_sctx;
}
void

View File

@@ -716,6 +716,49 @@ def Test_use_autoload_import_in_fold_expression()
&rtp = save_rtp
enddef
func Test_import_in_diffexpr()
CheckExecutable diff
call Run_Test_import_in_diffexpr()
endfunc
def Run_Test_import_in_diffexpr()
var lines =<< trim END
vim9script
export def DiffExpr()
# Prepend some text to check diff type detection
writefile(['warning', ' message'], v:fname_out)
silent exe '!diff ' .. v:fname_in .. ' '
.. v:fname_new .. '>>' .. v:fname_out
enddef
END
writefile(lines, 'Xdiffexpr')
lines =<< trim END
vim9script
import './Xdiffexpr' as diff
set diffexpr=diff.DiffExpr()
set diffopt=foldcolumn:0
END
CheckScriptSuccess(lines)
enew!
call setline(1, ['one', 'two', 'three'])
diffthis
botright vert new
call setline(1, ['one', 'two', 'three.'])
diffthis
# we only check if this does not cause errors
redraw
diffoff!
bwipe!
bwipe!
enddef
def Test_export_fails()
CheckScriptFailure(['export var some = 123'], 'E1042:')
CheckScriptFailure(['vim9script', 'export var g:some'], 'E1022:')

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4181,
/**/
4180,
/**/