patch 8.2.4183: cannot use an import in 'formatexpr'
Problem: Cannot use an import in 'formatexpr'.
Solution: Set the script context when evaluating 'formatexpr'.
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index e6d9728..1cf1eb0 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -759,6 +759,34 @@
bwipe!
enddef
+def Test_import_in_formatexpr()
+ var lines =<< trim END
+ vim9script
+ export def MyFormatExpr(): number
+ g:did_format = 'yes'
+ return 0
+ enddef
+ END
+ writefile(lines, 'Xformatter')
+
+ lines =<< trim END
+ vim9script
+ import './Xformatter' as format
+ set formatexpr=format.MyFormatExpr()
+ END
+ CheckScriptSuccess(lines)
+
+ new
+ setline(1, ['a', 'b', 'c'])
+ normal gqG
+ assert_equal('yes', g:did_format)
+
+ bwipe!
+ delete('Xformatter')
+ unlet g:did_format
+ set formatexpr=
+enddef
+
def Test_export_fails()
CheckScriptFailure(['export var some = 123'], 'E1042:')
CheckScriptFailure(['vim9script', 'export var g:some'], 'E1022:')
diff --git a/src/textformat.c b/src/textformat.c
index 3c343cd..fd0d31d 100644
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -903,6 +903,7 @@
OPT_LOCAL);
int r;
char_u *fex;
+ sctx_T save_sctx = current_sctx;
// Set v:lnum to the first line number and v:count to the number of lines.
// Set v:char to the character to be inserted (can be NUL).
@@ -914,6 +915,7 @@
fex = vim_strsave(curbuf->b_p_fex);
if (fex == NULL)
return 0;
+ current_sctx = curbuf->b_p_script_ctx[BV_FEX];
// Evaluate the function.
if (use_sandbox)
@@ -924,6 +926,7 @@
set_vim_var_string(VV_CHAR, NULL, -1);
vim_free(fex);
+ current_sctx = save_sctx;
return r;
}
diff --git a/src/version.c b/src/version.c
index fcf40bd..bdf7a3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4183,
+/**/
4182,
/**/
4181,