Fix multiple modifiers with non-typed property (#417)

atom · Mar 30, 2021 · 7382930 · 7382930
1 parent 9b703d8
commit 7382930
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/grammars/php.cson b/grammars/php.cson
@@ -697,7 +697,7 @@
   }
   {
     'match': '''(?xi)
-      ((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))+)                     # At least one modifier
+      ((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))++)                     # At least one modifier
       (
         (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type
         [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type

diff --git a/spec/php-spec.coffee b/spec/php-spec.coffee
@@ -731,6 +731,18 @@ describe 'PHP grammar', ->
         expect(lines[1][2]).toEqual value: '?', scopes: ["source.php", "meta.class.php", "meta.class.body.php", "keyword.operator.nullable-type.php"]
         expect(lines[1][4]).toEqual value: 'string', scopes: ["source.php", "meta.class.php", "meta.class.body.php", "storage.type.php"]
 
+      it 'tokenizes 2 modifiers correctly', ->
+        lines = grammar.tokenizeLines '''
+          class Foo {
+            public static $bar = 'baz';
+          }
+        '''
+
+        expect(lines[1][1]).toEqual value: 'public', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'storage.modifier.php']
+        expect(lines[1][3]).toEqual value: 'static', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'storage.modifier.php']
+        expect(lines[1][5]).toEqual value: '$', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'variable.other.php', 'punctuation.definition.variable.php']
+        expect(lines[1][6]).toEqual value: 'bar', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'variable.other.php']
+
       it 'tokenizes namespaces', ->
         lines = grammar.tokenizeLines '''
           class A {