Mercurial > vim
changeset 27338:c62006deb5c1 v8.2.4197
patch 8.2.4197: cannot use an import in the "expr" part of 'spellsuggest'
Commit: https://github.com/vim/vim/commit/2a7aa834583dea157eccf3e69827d2ff1d9fe9c7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 23 17:59:06 2022 +0000
patch 8.2.4197: cannot use an import in the "expr" part of 'spellsuggest'
Problem: Cannot use an import in the "expr" part of 'spellsuggest'.
Solution: Set the script context when evaluating "expr" of 'spellsuggest'.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 23 Jan 2022 19:00:02 +0100 |
parents | 65bdfff0b00a |
children | 9d2ab2f4f7e4 |
files | src/evalvars.c src/testdir/test_vim9_import.vim src/version.c |
diffstat | 3 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -495,12 +495,17 @@ eval_spell_expr(char_u *badword, char_u typval_T rettv; list_T *list = NULL; char_u *p = skipwhite(expr); + sctx_T saved_sctx = current_sctx; + sctx_T *ctx; // Set "v:val" to the bad word. prepare_vimvar(VV_VAL, &save_val); set_vim_var_string(VV_VAL, badword, -1); if (p_verbose == 0) ++emsg_off; + ctx = get_option_sctx("spellsuggest"); + if (ctx != NULL) + current_sctx = *ctx; if (eval1(&p, &rettv, &EVALARG_EVALUATE) == OK) { @@ -514,6 +519,7 @@ eval_spell_expr(char_u *badword, char_u --emsg_off; clear_tv(get_vim_var_tv(VV_VAL)); restore_vimvar(VV_VAL, &save_val); + current_sctx = saved_sctx; return list; }
--- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -936,6 +936,34 @@ def Test_import_in_charconvert() set charconvert& enddef +func Test_import_in_spellsuggest_expr() + CheckFeature spell + call Run_Test_import_in_spellsuggest_expr() +endfunc + +def Run_Test_import_in_spellsuggest_expr() + var lines =<< trim END + vim9script + export def MySuggest(): list<any> + return [['Fox', 8], ['Fop', 9]] + enddef + END + writefile(lines, 'Xsuggest.vim') + + lines =<< trim END + vim9script + import './Xsuggest.vim' as sugg + set spell spellsuggest=expr:sugg.MySuggest() + END + CheckScriptSuccess(lines) + + set verbose=1 # report errors + call assert_equal(['Fox', 'Fop'], spellsuggest('Fo', 2)) + + delete('Xsuggest.vim') + set nospell spellsuggest& verbose=0 +enddef + def Test_export_fails() CheckScriptFailure(['export var some = 123'], 'E1042:') CheckScriptFailure(['vim9script', 'export var g:some'], 'E1022:')