commit 9898107f54a330c6d9629976250a393169c698ca
author Bram Moolenaar <Bram@vim.org> Wed Jul 29 14:40:25 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Jul 29 14:40:25 2020 +0200
tree 8a4b2b3cbb974768201f899d0ca48b40789de488
parent b5ed266037dea49024e00c4e1f9c89f3a9ebaa60

patch 8.2.1314: Vim9: rule for comment after :function is confusing

Problem:    Vim9: rule for comment after :function is confusing.
Solution:   Allow double quoted comment after :function in vim9script.
            (closes #6556)

src/testdir/test_vim9_script.vim

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 427e912..b491fa2 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -2286,6 +2286,10 @@
       ])
   CheckScriptFailure([
       'vim9script',
+      'function " comment',
+      ], 'E129:')
+  CheckScriptFailure([
+      'vim9script',
       'function# comment',
       ], 'E129:')
   CheckScriptSuccess([
@@ -2333,11 +2337,11 @@
       'func Test() " comment',
       'endfunc',
       ])
-  CheckScriptFailure([
+  CheckScriptSuccess([
       'vim9script',
       'func Test() " comment',
       'endfunc',
-      ], 'E488:')
+      ])
 
   CheckScriptSuccess([
       'def Test() # comment',

src/userfunc.c

diff --git a/src/userfunc.c b/src/userfunc.c
index d17e807..343c9cd 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2832,7 +2832,8 @@
     if (*p == '\n')
 	line_arg = p + 1;
     else if (*p != NUL
-	    && !(*p == '"' && !(vim9script || eap->cmdidx == CMD_def))
+	    && !(*p == '"' && (!vim9script || eap->cmdidx == CMD_function)
+						     && eap->cmdidx != CMD_def)
 	    && !(*p == '#' && (vim9script || eap->cmdidx == CMD_def))
 	    && !eap->skip
 	    && !did_emsg)

src/version.c

diff --git a/src/version.c b/src/version.c
index fce9218..b1ed1df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1314,
+/**/
     1313,
 /**/
     1312,