From dee37dc733df444df1950eb922a35560e4b113d6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 7 Feb 2021 16:40:05 +0100 Subject: [PATCH] patch 8.2.2484: Vim9: Cannot use a comment starting with #{ Problem: Vim9: Cannot use a comment starting with #{ after an expression. Solution: Remove the check for "{" since #{ dictionaries are not supported. --- src/ex_docmd.c | 3 +-- src/testdir/test_vim9_script.vim | 4 ++++ src/version.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index a2e53ad34..9409d7c5e 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -5212,8 +5212,7 @@ ends_excmd2(char_u *cmd_start UNUSED, char_u *cmd) return TRUE; #ifdef FEAT_EVAL if (in_vim9script()) - return c == '#' && cmd[1] != '{' - && (cmd == cmd_start || VIM_ISWHITE(cmd[-1])); + return c == '#' && (cmd == cmd_start || VIM_ISWHITE(cmd[-1])); #endif return c == '"'; } diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 72e12740a..7f1e71dc6 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2205,6 +2205,10 @@ def Test_while_loop() result ..= cnt .. '_' endwhile assert_equal('1_3_', result) + + var s = '' + while s == 'x' #{comment + endwhile enddef def Test_while_loop_fails() diff --git a/src/version.c b/src/version.c index 4c5310700..cbef3daf6 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2484, /**/ 2483, /**/ -- 2.50.1