diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 65fa977d8..1f639e2b3 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -5607,15 +5607,13 @@ def Test_abstract_method() v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3) # Use a static abstract method - # TODO: this does not fail, so skip it for now - - # lines =<< trim END - # vim9script - # abstract class A - # abstract static def Foo(): number - # endclass - # END - # v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3) + lines =<< trim END + vim9script + abstract class A + abstract static def Foo(): number + endclass + END + v9.CheckSourceFailure(lines, 'E1371: Abstract must be followed by "def"', 3) # Type mismatch between abstract method and concrete method lines =<< trim END diff --git a/src/version.c b/src/version.c index a47536170..e45df160b 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2088, /**/ 2087, /**/ diff --git a/src/vim9class.c b/src/vim9class.c index f709c1f04..e9131fe3b 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -1557,13 +1557,6 @@ early_ret: break; } - p = skipwhite(pa + 8); - if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0) - { - emsg(_(e_abstract_must_be_followed_by_def)); - break; - } - if (!is_class) { // "abstract" not supported in an interface @@ -1577,6 +1570,13 @@ early_ret: break; } + p = skipwhite(pa + 8); + if (STRNCMP(p, "def", 3) != 0) + { + emsg(_(e_abstract_must_be_followed_by_def)); + break; + } + abstract_method = TRUE; }