neovim

commit b25197258086faa94ddfaa2a74e1d0eb3695d9b3
parent bc1dbebe1f18df719b9e357f4d8b9bea3a3581b8
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sun, 13 Nov 2022 07:24:44 +0800

vim-patch:9.0.0869: bogus error when string used after :elseif

Problem:    Bogus error when string used after :elseif.
Solution:   Do not consider a double quote the start of a comment.
            (closes vim/vim#11534)

https://github.com/vim/vim/commit/28c56d501352bd98472d23667bade683877cadcc

Co-authored-by: Bram Moolenaar <Bram@vim.org>

Diffstat:
M
src/nvim/ex_eval.c
 | 
3
++-
M
src/nvim/testdir/test_vimscript.vim
 | 
10
++++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
@@ -901,7 +901,8 @@ void ex_else(exarg_T *eap)
     bool error;
     // When skipping we ignore most errors, but a missing expression is
     // wrong, perhaps it should have been "else".
-    if (skip && ends_excmd(*eap->arg)) {
+    // A double quote here is the start of a string, not a comment.
+    if (skip && *eap->arg != '"' && ends_excmd(*eap->arg)) {
       semsg(_(e_invexpr2), eap->arg);
     } else {
       result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
diff --git a/src/nvim/testdir/test_vimscript.vim b/src/nvim/testdir/test_vimscript.vim
@@ -193,6 +193,16 @@ func Test_if_while()
     call assert_equal('ab3j3b2c2b1f1h1km', g:Xpath)
 endfunc
 
+" Check double quote after skipped "elseif" does not give error E15
+func Test_skipped_elseif()
+  if "foo" ==? "foo"
+      let result = "first"
+  elseif "foo" ==? "foo"
+      let result = "second"
+  endif
+  call assert_equal('first', result)
+endfunc
+
 "-------------------------------------------------------------------------------
 " Test 4:   :return							    {{{1
 "-------------------------------------------------------------------------------