Mercurial > vim
changeset 21689:10866fd07595 v8.2.1394
patch 8.2.1394: Vim9: compiling a function interferes with command modifiers
Commit: https://github.com/vim/vim/commit/2dd0a2c39a3b3fbffc94d0676e472c78d02ebdbd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 8 15:10:27 2020 +0200
patch 8.2.1394: Vim9: compiling a function interferes with command modifiers
Problem: Vim9: compiling a function interferes with command modifiers.
Solution: Save and restore command modifiers. (closes https://github.com/vim/vim/issues/6658)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Aug 2020 15:15:04 +0200 |
| parents | c94bf5ee110e |
| children | 0d43ab8ae99d |
| files | src/testdir/test_vim9_func.vim src/testdir/test_vim9_script.vim src/version.c src/vim9compile.c |
| diffstat | 4 files changed, 35 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1351,5 +1351,30 @@ def Test_partial_call() assert_equal({'title': 'test'}, getqflist({'title': 1})) enddef +def Test_cmd_modifier() + tab echo '0' + call CheckDefFailure(['5tab echo 3'], 'E16:') +enddef + +def Test_restore_modifiers() + # check that when compiling a :def function command modifiers are not messed + # up. + let lines =<< trim END + vim9script + set eventignore= + autocmd QuickFixCmdPost * copen + def AutocmdsDisabled() + eval 0 + enddef + func Func() + noautocmd call s:AutocmdsDisabled() + let g:ei_after = &eventignore + endfunc + Func() + END + CheckScriptSuccess(lines) + assert_equal('', g:ei_after) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -751,11 +751,6 @@ func Test_block_failure() call CheckDefFailure(['{', 'echo 1'], 'E1026:') endfunc -def Test_cmd_modifier() - tab echo '0' - call CheckDefFailure(['5tab echo 3'], 'E16:') -enddef - func g:NoSuchFunc() echo 'none' endfunc
--- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1394, +/**/ 1393, /**/ 1392,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2668,7 +2668,7 @@ next_line_from_context(cctx_T *cctx, int cctx->ctx_line_start = line; SOURCING_LNUM = cctx->ctx_lnum + 1; } while (line == NULL || *skipwhite(line) == NUL - || (skip_comment && vim9_comment_start(skipwhite(line)))); + || (skip_comment && vim9_comment_start(skipwhite(line)))); return line; } @@ -7194,10 +7194,11 @@ compile_def_function(ufunc_T *ufunc, int */ for (;;) { - exarg_T ea; - int starts_with_colon = FALSE; - char_u *cmd; - int save_msg_scroll = msg_scroll; + exarg_T ea; + cmdmod_T save_cmdmod; + int starts_with_colon = FALSE; + char_u *cmd; + int save_msg_scroll = msg_scroll; // Bail out on the first error to avoid a flood of errors and report // the right line number when inside try/catch. @@ -7278,6 +7279,7 @@ compile_def_function(ufunc_T *ufunc, int /* * COMMAND MODIFIERS */ + save_cmdmod = cmdmod; if (parse_command_modifiers(&ea, &errormsg, FALSE) == FAIL) { if (errormsg != NULL) @@ -7288,7 +7290,7 @@ compile_def_function(ufunc_T *ufunc, int } // TODO: use modifiers in the command undo_cmdmod(&ea, save_msg_scroll); - CLEAR_FIELD(cmdmod); + cmdmod = save_cmdmod; // Skip ":call" to get to the function name. if (checkforcmd(&ea.cmd, "call", 3))