To: vim_dev@googlegroups.com Subject: Patch 8.2.1314 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1314 Problem: Vim9: rule for comment after :function is confusing. Solution: Allow double quoted comment after :function in vim9script. (closes #6556) Files: src/userfunc.c, src/testdir/test_vim9_script.vim *** ../vim-8.2.1313/src/userfunc.c 2020-07-26 17:56:20.448638742 +0200 --- src/userfunc.c 2020-07-29 14:31:17.581479893 +0200 *************** *** 2832,2838 **** if (*p == '\n') line_arg = p + 1; else if (*p != NUL ! && !(*p == '"' && !(vim9script || eap->cmdidx == CMD_def)) && !(*p == '#' && (vim9script || eap->cmdidx == CMD_def)) && !eap->skip && !did_emsg) --- 2832,2839 ---- if (*p == '\n') line_arg = p + 1; else if (*p != NUL ! && !(*p == '"' && (!vim9script || eap->cmdidx == CMD_function) ! && eap->cmdidx != CMD_def) && !(*p == '#' && (vim9script || eap->cmdidx == CMD_def)) && !eap->skip && !did_emsg) *** ../vim-8.2.1313/src/testdir/test_vim9_script.vim 2020-07-28 22:38:34.244502300 +0200 --- src/testdir/test_vim9_script.vim 2020-07-29 14:37:32.339937298 +0200 *************** *** 2286,2291 **** --- 2286,2295 ---- ]) CheckScriptFailure([ 'vim9script', + 'function " comment', + ], 'E129:') + CheckScriptFailure([ + 'vim9script', 'function# comment', ], 'E129:') CheckScriptSuccess([ *************** *** 2333,2343 **** 'func Test() " comment', 'endfunc', ]) ! CheckScriptFailure([ 'vim9script', 'func Test() " comment', 'endfunc', ! ], 'E488:') CheckScriptSuccess([ 'def Test() # comment', --- 2337,2347 ---- 'func Test() " comment', 'endfunc', ]) ! CheckScriptSuccess([ 'vim9script', 'func Test() " comment', 'endfunc', ! ]) CheckScriptSuccess([ 'def Test() # comment', *** ../vim-8.2.1313/src/version.c 2020-07-28 22:38:34.244502300 +0200 --- src/version.c 2020-07-29 13:18:48.983737850 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1314, /**/ -- From "know your smileys": %-) After staring at screen for 15 hours /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///