thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.1.0378: Vim9: no comments allowed after class vars

Browse Source 
Problem:  Vim9: no comments allowed after class vars
          (Christian Robinson, after 9.1.376)
Solution: Allow trailing comments after class vars
          (Yegappan Lakshmanan)

closes: #14651

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan 2024-04-28 09:54:09 +02:00 committed by Christian Brabandt
parent 1125051040
commit fe55c31752
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_vim9_class.vim
View File

@ -103,6 +103,18 @@ def Test_class_basic()
END
v9.CheckSourceFailure(lines, "E488: Trailing characters: | var y = 10", 3)
# Comments are allowed after an inline block
lines =<< trim END
vim9script
class Foo
static const bar = { # {{{
baz: 'qux'
} # }}}
endclass
assert_equal({baz: 'qux'}, Foo.bar)
END
v9.CheckSourceSuccess(lines)
# Try to define a class with the same name as an existing variable
lines =<< trim END
vim9script

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
378,
/**/
377,
/**/

2
src/vim9class.c
View File

@ -137,7 +137,7 @@ parse_member(
(void)skip_expr_concatenate(&init_arg, &expr_start, &expr_end, &evalarg);
init_arg = skipwhite(init_arg);
if (*init_arg != NUL)
if (*init_arg != NUL && !vim9_comment_start(init_arg))
{
semsg(_(e_trailing_characters_str), init_arg);
return FAIL;