Mercurial > vim
changeset 28698:096a5f9a03a8 v8.2.4873
patch 8.2.4873: Vim9: using "else" differs from using "endif/if !cond"
Commit: https://github.com/vim/vim/commit/505ed0c38f73b5c2d1695b4d51518b690d72eb3b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 5 17:02:46 2022 +0100
patch 8.2.4873: Vim9: using "else" differs from using "endif/if !cond"
Problem: Vim9: using "else" differs from using "endif/if !cond".
Solution: Leave the block and enter another one. (closes https://github.com/vim/vim/issues/10320)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 05 May 2022 18:15:02 +0200 |
| parents | 4b66e6223f65 |
| children | 32582071f130 |
| files | src/ex_eval.c src/testdir/test_vim9_script.vim src/version.c |
| diffstat | 3 files changed, 51 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1124,6 +1124,11 @@ ex_else(exarg_T *eap) skip = TRUE; } + // Variables declared in the previous block can no longer be + // used. Needs to be done before setting "cs_flags". + leave_block(cstack); + enter_block(cstack); + // if skipping or the ":if" was TRUE, reset ACTIVE, otherwise set it if (skip || cstack->cs_flags[cstack->cs_idx] & CSF_TRUE) {
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1640,6 +1640,50 @@ def Test_if_elseif_else_fails() v9.CheckDefAndScriptFailure(lines, ['E1143:', 'E15:'], 4) enddef +def Test_if_else_func_using_var() + var lines =<< trim END + vim9script + + const debug = true + if debug + var mode_chars = 'something' + def Bits2Ascii() + var x = mode_chars + g:where = 'in true' + enddef + else + def Bits2Ascii() + g:where = 'in false' + enddef + endif + + Bits2Ascii() + END + v9.CheckScriptSuccess(lines) + assert_equal('in true', g:where) + unlet g:where + + lines =<< trim END + vim9script + + const debug = false + if debug + var mode_chars = 'something' + def Bits2Ascii() + g:where = 'in true' + enddef + else + def Bits2Ascii() + var x = mode_chars + g:where = 'in false' + enddef + endif + + Bits2Ascii() + END + v9.CheckScriptFailure(lines, 'E1001: Variable not found: mode_chars') +enddef + let g:bool_true = v:true let g:bool_false = v:false