Merge pull request #411 from KapitanOczywisty/FixAttributes

Fix attributes with leading whitespaces
atom · Jan 12, 2021 · 47e1a1f · 47e1a1f
2 parents d0da77f + 48abde6
commit 47e1a1f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/grammars/php.cson b/grammars/php.cson
@@ -1188,7 +1188,7 @@
         ]
       }
       {
-        'begin': '(^\\s+)?(?=#)'
+        'begin': '(^\\s+)?(?=#)(?!#\\[)'
         'beginCaptures':
           '1':
             'name': 'punctuation.whitespace.comment.leading.php'

diff --git a/spec/php-spec.coffee b/spec/php-spec.coffee
@@ -2151,6 +2151,23 @@ describe 'PHP grammar', ->
       expect(tokens[4]).toEqual value: 'class', scopes: ['source.php', 'meta.class.php', 'storage.type.class.php']
       expect(tokens[6]).toEqual value: 'Foo', scopes: ['source.php', 'meta.class.php', 'entity.name.type.class.php']
 
+    it 'should tokenize attribute for method', ->
+      lines = grammar.tokenizeLines '''
+        class Foo {
+          #[ExampleAttribute]
+          public function bar() {}
+          # I'm a happy comment!
+          public function baz() {}
+        }
+      '''
+
+      expect(lines[1][1]).toEqual value: '#[', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'meta.attribute.php']
+      expect(lines[1][2]).toEqual value: 'ExampleAttribute', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'meta.attribute.php', 'support.attribute.php']
+      expect(lines[1][3]).toEqual value: ']', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'meta.attribute.php']
+      expect(lines[3][0]).toEqual value: '  ', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'punctuation.whitespace.comment.leading.php']
+      expect(lines[3][1]).toEqual value: '#', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'comment.line.number-sign.php', 'punctuation.definition.comment.php']
+      expect(lines[3][2]).toEqual value: ' I\'m a happy comment!', scopes: ['source.php', 'meta.class.php', 'meta.class.body.php', 'comment.line.number-sign.php']
+
     it 'should tokenize attribute with namespace', ->
       {tokens} = grammar.tokenizeLine '#[Foo\\Bar\\Attribute]'