start on classes

Author: claytonrcarter

grammars/tree-sitter-php.cson

@@ -155,7 +155,7 @@ scopes:
 
   'comment': [
       {match: '^//', scopes: 'comment.line.double-slash.php'},
-      'comment.block'
+      'comment.block.php'
   ]
 
   'variable_name': [
@@ -165,6 +165,8 @@ scopes:
   'variable_name > "$"': 'punctuation.definition.variable.php'
   'parenthesized_expression > "("': 'punctuation.definition.begin.bracket.round.php'
   'parenthesized_expression > ")"': 'punctuation.definition.end.bracket.round.php'
+  'object_creation_expression > arguments > "("': 'punctuation.definition.begin.bracket.round.php'
+  'object_creation_expression > arguments > ")"': 'punctuation.definition.end.bracket.round.php'
   'arguments > "("': 'punctuation.definition.arguments.begin.bracket.round.php'
   'arguments > ")"': 'punctuation.definition.arguments.end.bracket.round.php'
   'formal_parameters > "("': 'punctuation.definition.parameters.begin.bracket.round.php'

spec/tree-sitter-spec.js

@@ -1662,4 +1662,97 @@ ${caret}
     // SKIP this is covered by tree-sitter-php, not this grammar
     // it("tokenizes trailing comma in use statements", () => {});
   });
+
+  describe("classes", () => {
+    it("tokenizes class declarations", () => {
+      editor.setContent("class Test { /* stuff */ }");
+
+      expect(editor).toHaveScopesAtPosition(
+        [1, 0],
+        ["source.php", "meta.class.php", "storage.type.class.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 5],
+        ["source.php", "meta.class.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 6],
+        ["source.php", "meta.class.php", "entity.name.type.class.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 10],
+        ["source.php", "meta.class.php"]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 11],
+        [
+          "source.php",
+          "meta.class.php",
+          // FIXME TM doesn't include this, TS does
+          "meta.class.body.php",
+          "punctuation.definition.class.begin.bracket.curly.php"
+        ]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 12],
+        ["source.php", "meta.class.php", "meta.class.body.php"]
+      );
+      // /*
+      expect(editor).toHaveScopesAtPosition(
+        [1, 13],
+        [
+          "source.php",
+          "meta.class.php",
+          "meta.class.body.php",
+          "comment.block.php"
+          // FIXME how to select & scope this?
+          // "punctuation.definition.comment.php"
+        ]
+      );
+      expect(editor).toHaveScopesAtPosition(
+        [1, 25],
+        [
+          "source.php",
+          "meta.class.php",
+          // FIXME TM doesn't include this, TS does
+          "meta.class.body.php",
+          "punctuation.definition.class.end.bracket.curly.php"
+        ]
+      );
+    });
+
+    it("tokenizes class instantiation", () => {
+      editor.setContent("$a = new ClassName();");
+
+      // new
+      expect(editor).toHaveScopesAtPosition(
+        [1, 5],
+        ["source.php", "keyword.other.new.php"]
+      );
+      // ' '
+      expect(editor).toHaveScopesAtPosition([1, 8], ["source.php"]);
+      // ClassName
+      expect(editor).toHaveScopesAtPosition(
+        [1, 9],
+        ["source.php", "support.class.php"]
+      );
+      // (
+      expect(editor).toHaveScopesAtPosition(
+        [1, 18],
+        // FIXME I wonder if punctuation.definition.arguments.begin.bracket.round.php
+        // would be more correct: these are surrounding arguments to a new instance
+        ["source.php", "punctuation.definition.begin.bracket.round.php"]
+      );
+      // )
+      expect(editor).toHaveScopesAtPosition(
+        [1, 19],
+        ["source.php", "punctuation.definition.end.bracket.round.php"]
+      );
+      // ;
+      expect(editor).toHaveScopesAtPosition(
+        [1, 20],
+        ["source.php", "punctuation.terminator.expression.php"]
+      );
+    });
+  });
 });