class modifiers

Author: claytonrcarter

grammars/tree-sitter-php.cson

@@ -136,7 +136,7 @@ scopes:
     'meta.function.parameter.no-default.php'
   ]
 
-  'object_creation_expression > qualified_name > name': 'entity.name.type.class'
+  'object_creation_expression > qualified_name > name': 'support.class.php'
   'object_creation_expression > new_variable > simple_variable': 'meta.class.instance.constructor'
 
   'const_element > name': 'constant'
@@ -184,10 +184,10 @@ scopes:
   '"protected"': 'storage.modifier.php'
   '"global"': 'storage.modifier'
   '"const"': 'storage.modifier'
-  '"abstract"': 'storage.modifier.abstract'
+  '"abstract"': 'storage.modifier.abstract.php'
   '"extends"': 'storage.modifier.extends.php'
   '"implements"': 'storage.modifier.implements'
-  '"final"': 'storage.modifier.final'
+  '"final"': 'storage.modifier.final.php'
   '"use"': 'keyword.other.use.php'
   '"namespace"': 'keyword.other.namespace.php'
 

spec/tree-sitter-spec.js

@@ -1754,5 +1754,43 @@ ${caret}
         ["source.php", "punctuation.terminator.expression.php"]
       );
     });
+
+    it("tokenizes class modifiers", () => {
+      editor.setContent("abstract class Test {}");
+
+      expect(editor).toHaveScopesAtPosition(
+        [1, 0],
+        ["source.php", "meta.class.php", "storage.modifier.abstract.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 8],
+        ["source.php", "meta.class.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 9],
+        ["source.php", "meta.class.php", "storage.type.class.php"]
+      );
+
+      editor.setContent("final class Test {}");
+
+      expect(editor).toHaveScopesAtPosition(
+        [1, 0],
+        ["source.php", "meta.class.php", "storage.modifier.final.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 6],
+        ["source.php", "meta.class.php", "storage.type.class.php"]
+      );
+    });
+
+    // SKIP TS-php handles this
+    // it('tokenizes classes declared immediately after another class ends', () => {})
+
+    describe('properties', () => {
+      it('tokenizes types', () => {
+        // up next...
+      });
+    });
+
   });
 });