Mercurial > vim
diff src/testdir/test_vim9_import.vim @ 27305:30d8437ad7cc v8.2.4181
patch 8.2.4181: Vim9: cannot use an import in 'diffexpr'
Commit: https://github.com/vim/vim/commit/7b29f6a3949743914f08410b6f6bd6237c2f2038
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 22 17:58:13 2022 +0000
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 22 Jan 2022 19:00:04 +0100 |
| parents | ebe56a24acb6 |
| children | 391011658d95 |
line wrap: on
line diff
--- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -716,6 +716,49 @@ def Test_use_autoload_import_in_fold_exp &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:')