Mercurial > vim
changeset 26230:8b8470b511f5 v8.2.3646
patch 8.2.3646: using <sfile> in a function gives an unexpected result
Commit: https://github.com/vim/vim/commit/c449271f4efa44725c40116a95b213813040312f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 22 15:37:15 2021 +0000
patch 8.2.3646: using <sfile> in a function gives an unexpected result
Problem: Using <sfile> in a function gives an unexpected result.
Solution: Give an error in a Vim9 function. (issue https://github.com/vim/vim/issues/9189)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 22 Nov 2021 16:45:04 +0100 |
| parents | 1728a23d8052 |
| children | 60411d698365 |
| files | src/errors.h src/scriptfile.c src/testdir/test_vim9_builtin.vim src/version.c |
| diffstat | 4 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -684,3 +684,5 @@ EXTERN char e_ascii_code_not_in_range[] INIT(= N_("E1243: ASCII code not in 32-127 range")); EXTERN char e_bad_color_string_str[] INIT(= N_("E1244: Bad color string: %s")); +EXTERN char e_cannot_expand_sfile_in_vim9_function[] + INIT(= N_("E1245: Cannot expand <sfile> in a Vim9 function"));
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -135,6 +135,20 @@ estack_sfile(estack_arg_T which UNUSED) return vim_strsave(entry->es_name); } #ifdef FEAT_EVAL + // expand('<sfile>') works in a function for backwards compatibility, but + // may give an unexpected result. Disallow it in Vim 9 script. + if (which == ESTACK_SFILE && in_vim9script()) + { + int save_emsg_off = emsg_off; + + if (emsg_off == 1) + // f_expand() silences errors but we do want this one + emsg_off = 0; + emsg(_(e_cannot_expand_sfile_in_vim9_function)); + emsg_off = save_emsg_off; + return NULL; + } + // Give information about each stack entry up to the root. // For a function we compose the call stack, as it was done in the past: // "function One[123]..Two[456]..Three"
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -915,6 +915,14 @@ def Test_expand() CheckDefAndScriptFailure2(['expand("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1212: Bool required for argument 2') CheckDefAndScriptFailure2(['expand("a", true, 2)'], 'E1013: Argument 3: type mismatch, expected bool but got number', 'E1212: Bool required for argument 3') expand('')->assert_equal('') + + var caught = false + try + echo expand("<sfile>") + catch /E1245:/ + caught = true + endtry + assert_true(caught) enddef def Test_expandcmd()