Merge pull request #852 from savetheclocktower/add-php-grammar

Tree-sitter fixes for December (including a PHP grammar!)

Author: savetheclocktower

packages/language-c/grammars/tree-sitter-cpp/highlights.scm

@@ -138,6 +138,9 @@
 (function_declarator
   (field_identifier) @entity.name.function.method.cpp)
 
+(field_initializer
+  (field_identifier) @entity.name.function.cpp)
+
 (call_expression
   (identifier) @support.function.c99.cpp
   ; Regex copied from the TM grammar.

packages/language-c/lib/main.js

@@ -1,16 +1,39 @@
-exports.activate = function() {
+exports.activate = function () {
   // Highlight macro bodies as C/C++
   for (const language of ['c', 'cpp']) {
     for (const nodeType of ['preproc_def', 'preproc_function_def']) {
       atom.grammars.addInjectionPoint(`source.${language}`, {
         type: nodeType,
-        language(node) {
+        language() {
           return language;
         },
         content(node) {
           return node.lastNamedChild;
         }
       });
     }
+
+    const TODO_PATTERN = /\b(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|DEBUG|OPTIMIZE|WARNING)\b/;
+    const HYPERLINK_PATTERN = /\bhttps?:/
+
+    atom.grammars.addInjectionPoint(`source.${language}`, {
+      type: 'comment',
+      language: (node) => {
+        return TODO_PATTERN.test(node.text) ? 'todo' : undefined;
+      },
+      content: (node) => node,
+      languageScope: null
+    });
+
+    for (let type of ['string_literal', 'comment']) {
+      atom.grammars.addInjectionPoint(`source.${language}`, {
+        type,
+        language: (node) => {
+          return HYPERLINK_PATTERN.test(node.text) ? 'hyperlink' : undefined;
+        },
+        content: (node) => node,
+        languageScope: null
+      });
+    }
   }
 };

packages/language-c/package.json

@@ -10,7 +10,7 @@
   "license": "MIT",
   "engines": {
     "atom": "*",
-    "node": "*"
+    "node": ">=12"
   },
   "dependencies": {
     "tree-sitter-c": "0.20.2",

packages/language-css/lib/main.js

@@ -1,22 +1,27 @@
 exports.activate = () => {
 
-  atom.grammars.addInjectionPoint('source.css', {
-    type: 'comment',
-    language: () => 'todo',
-    content: (node) => node
-  });
+  const TODO_PATTERN = /\b(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|DEBUG|OPTIMIZE|WARNING)\b/;
+  const HYPERLINK_PATTERN = /\bhttps?:/
 
   atom.grammars.addInjectionPoint('source.css', {
     type: 'comment',
-    language: () => 'hyperlink',
-    content: (node) => node
+    language(node) {
+      return TODO_PATTERN.test(node.text) ? 'todo' : undefined;
+    },
+    content: (node) => node,
+    languageScope: null
   });
 
-  atom.grammars.addInjectionPoint('source.css', {
-    type: 'string_value',
-    language: () => 'hyperlink',
-    content: (node) => node
-  });
+  for (let type of ['comment', 'string_value']) {
+    atom.grammars.addInjectionPoint('source.css', {
+      type,
+      language(node) {
+        return HYPERLINK_PATTERN.test(node.text) ? 'hyperlink' : undefined;
+      },
+      content: (node) => node,
+      languageScope: null
+    });
+  }
 
   // Catch things like
   //
@@ -31,7 +36,8 @@ exports.activate = () => {
       if (!functionName === 'url') { return null; }
 
       return node.descendantsOfType('plain_value');
-    }
+    },
+    languageScope: null
   });
 
 };

packages/language-go/lib/main.js

@@ -0,0 +1,25 @@
+exports.activate = () => {
+  const TODO_PATTERN = /\b(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|DEBUG|OPTIMIZE|WARNING)\b/;
+  const HYPERLINK_PATTERN = /\bhttps?:/
+
+  for (let type of ['comment', 'interpreted_string_literal', 'raw_string_literal']) {
+    atom.grammars.addInjectionPoint('source.go', {
+      type,
+      language: (node) => {
+        return HYPERLINK_PATTERN.test(node.text) ? 'hyperlink' : undefined;
+      },
+      content: (node) => node,
+      languageScope: null
+    });
+  }
+
+  atom.grammars.addInjectionPoint('source.go', {
+    type: 'comment',
+    language(node) {
+      return TODO_PATTERN.test(node.text) ? 'todo' : undefined;
+    },
+    content: (node) => node,
+    languageScope: null
+  });
+
+};

packages/language-go/package.json

@@ -1,6 +1,7 @@
 {
   "name": "language-go",
   "description": "Go language support in Atom",
+  "main": "lib/main",
   "keywords": [
     "tree-sitter"
   ],

packages/language-html/grammars/tree-sitter-html/folds.scm

@@ -1,8 +1,4 @@
 
-; (element) @fold
-; (style_element) @fold
-; (script_element) @fold
-
 [
   (element)
   (script_element)

packages/language-hyperlink/spec/hyperlink-spec.js

@@ -1,21 +1,26 @@
 
 const path = require('path');
 
-describe('Hyperlink grammar', function() {
+describe('Hyperlink grammar', function () {
   let grammar = null;
 
-  beforeEach(function() {
+  beforeEach(function () {
+    // TODO: All these specs rely on the ability of a grammar to tokenize a
+    // line in isolation, which is something that a `WASMTreeSitterGrammar`
+    // cannot do. This package will need specialized tests for the modern
+    // Tree-sitter world the same way that most other language packages do.
+    atom.config.set('core.useTreeSitterParsers', false);
     waitsForPromise(() => atom.packages.activatePackage('language-hyperlink'));
 
     runs(() => grammar = atom.grammars.grammarForScopeName('text.hyperlink'));
   });
 
-  it('parses the grammar', function() {
+  it('parses the grammar', function () {
     expect(grammar).toBeTruthy();
     expect(grammar.scopeName).toBe('text.hyperlink');
   });
 
-  it('parses http: and https: links', function() {
+  it('parses http: and https: links', function () {
     const plainGrammar = atom.grammars.selectGrammar();
 
     let {tokens} = plainGrammar.tokenizeLine('http://github.com');
@@ -29,16 +34,16 @@ describe('Hyperlink grammar', function() {
 
     ({tokens} = plainGrammar.tokenizeLine('https://github.com/atom/brightray_example'));
     expect(tokens[0]).toEqual({value: 'https://github.com/atom/brightray_example', scopes: ['text.plain.null-grammar', 'markup.underline.link.https.hyperlink']});
-});
+  });
 
-  it('parses http: and https: links that contains unicode characters', function() {
+  it('parses http: and https: links that contains unicode characters', function () {
     const plainGrammar = atom.grammars.selectGrammar();
 
     const {tokens} = plainGrammar.tokenizeLine('https://sv.wikipedia.org/wiki/Mañana');
     expect(tokens[0]).toEqual({value: 'https://sv.wikipedia.org/wiki/Mañana', scopes: ['text.plain.null-grammar', 'markup.underline.link.https.hyperlink']});
-});
+  });
 
-  it('parses other links', function() {
+  it('parses other links', function () {
     const plainGrammar = atom.grammars.selectGrammar();
 
     let {tokens} = plainGrammar.tokenizeLine('mailto:noreply@example.com');
@@ -49,55 +54,57 @@ describe('Hyperlink grammar', function() {
 
     ({tokens} = plainGrammar.tokenizeLine('atom://core/open/file?filename=urlEncodedFileName&line=n&column=n'));
     expect(tokens[0]).toEqual({value: 'atom://core/open/file?filename=urlEncodedFileName&line=n&column=n', scopes: ['text.plain.null-grammar', 'markup.underline.link.atom.hyperlink']});
-});
+  });
 
-  it('does not parse links in a regex string', function() {
+  it('does not parse links in a regex string', function () {
     const testGrammar = atom.grammars.loadGrammarSync(path.join(__dirname, 'fixtures', 'test-grammar.cson'));
 
     const {tokens} = testGrammar.tokenizeLine('regexp:http://github.com');
     expect(tokens[1]).toEqual({value: 'http://github.com', scopes: ['source.test', 'string.regexp.test']});
-});
-
-  describe('parsing PHP strings', () => it('does not parse links in a regex string', function() {
-    // PHP is unique in that its root scope is `text.html.php`, meaning that even though
-    // `string - string.regexp` won't match in a regex string, `text` still will.
-    // This is the reason the injection selector is `text - string.regexp` instead.
-    // https://github.com/atom/language-php/issues/219
-
-    waitsForPromise(() => atom.packages.activatePackage('language-php'));
-
-    runs(function() {
-      const phpGrammar = atom.grammars.grammarForScopeName('text.html.php');
+  });
 
-      const {tokens} = phpGrammar.tokenizeLine('<?php "/mailto:/" ?>');
-      expect(tokens[3]).toEqual({value: 'mailto:', scopes: ['text.html.php', 'meta.embedded.line.php', 'source.php', 'string.regexp.double-quoted.php']});});
-}));
+  describe('parsing PHP strings', () => {
+    it('does not parse links in a regex string', function () {
+      // PHP is unique in that its root scope is `text.html.php`, meaning that even though
+      // `string - string.regexp` won't match in a regex string, `text` still will.
+      // This is the reason the injection selector is `text - string.regexp` instead.
+      // https://github.com/atom/language-php/issues/219
+
+      waitsForPromise(() => atom.packages.activatePackage('language-php'));
+
+      runs(() => {
+        const phpGrammar = atom.grammars.grammarForScopeName('text.html.php');
+        const {tokens} = phpGrammar.tokenizeLine('<?php "/mailto:/" ?>');
+        expect(tokens[3]).toEqual({ value: 'mailto:', scopes: ['text.html.php', 'meta.embedded.line.php', 'source.php', 'string.regexp.double-quoted.php']});
+      });
+    });
+  });
 
-  describe('parsing cfml strings', function() {
-    it('does not include anything between (and including) pound signs', function() {
+  describe('parsing cfml strings', function () {
+    it('does not include anything between (and including) pound signs', function () {
       const plainGrammar = atom.grammars.selectGrammar();
       const {tokens} = plainGrammar.tokenizeLine('http://github.com/#username#');
       expect(tokens[0]).toEqual({value: 'http://github.com/', scopes: ['text.plain.null-grammar', 'markup.underline.link.http.hyperlink']});
-  });
+    });
 
-    it('still includes single pound signs', function() {
+    it('still includes single pound signs', function () {
       const plainGrammar = atom.grammars.selectGrammar();
       const {tokens} = plainGrammar.tokenizeLine('http://github.com/atom/#start-of-content');
       expect(tokens[0]).toEqual({value: 'http://github.com/atom/#start-of-content', scopes: ['text.plain.null-grammar', 'markup.underline.link.http.hyperlink']});
+    });
   });
-});
 
-  describe('parsing matching parentheses', function() {
-    it('still includes matching parentheses', function() {
+  describe('parsing matching parentheses', function () {
+    it('still includes matching parentheses', function () {
       const plainGrammar = atom.grammars.selectGrammar();
       const {tokens} = plainGrammar.tokenizeLine('https://en.wikipedia.org/wiki/Atom_(text_editor)');
       expect(tokens[0]).toEqual({value: 'https://en.wikipedia.org/wiki/Atom_(text_editor)', scopes: ['text.plain.null-grammar', 'markup.underline.link.https.hyperlink']});
-  });
+    });
 
-    it('does not include wrapping parentheses', function() {
+    it('does not include wrapping parentheses', function () {
       const plainGrammar = atom.grammars.selectGrammar();
       const {tokens} = plainGrammar.tokenizeLine('(https://en.wikipedia.org/wiki/Atom_(text_editor))');
       expect(tokens[1]).toEqual({value: 'https://en.wikipedia.org/wiki/Atom_(text_editor)', scopes: ['text.plain.null-grammar', 'markup.underline.link.https.hyperlink']});
+    });
   });
 });
-});

packages/language-java/lib/main.js

@@ -1,3 +1,24 @@
 exports.activate = () => {
-  // TODO: Injections for language-todo and language-hyperlink.
+  const TODO_PATTERN = /\b(TODO|FIXME|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|DEBUG|OPTIMIZE|WARNING)\b/;
+  const HYPERLINK_PATTERN = /\bhttps?:/
+
+  atom.grammars.addInjectionPoint('source.java', {
+    type: 'comment',
+    language: (node) => {
+      return TODO_PATTERN.test(node.text) ? 'todo' : undefined;
+    },
+    content: (node) => node,
+    languageScope: null
+  });
+
+  for (let type of ['string_literal', 'comment']) {
+    atom.grammars.addInjectionPoint('source.java', {
+      type,
+      language: (node) => {
+        return HYPERLINK_PATTERN.test(node.text) ? 'hyperlink' : undefined;
+      },
+      content: (node) => node,
+      languageScope: null
+    });
+  }
 };

packages/language-javascript/grammars/ts/highlights.scm

@@ -74,7 +74,13 @@
 ; The "bar" in `foo.bar = true`
 (assignment_expression
   left: (member_expression
-    property: (property_identifier)) @variable.other.assignment.property.js)
+    property: (property_identifier) @variable.other.assignment.property.js))
+
+; The "bar" in `foo.#bar = true`
+(assignment_expression
+  left: (member_expression
+    property: (private_property_identifier) @variable.other.assignment.property.private.js))
+
 
 ; The "foo" in `foo += 1`.
 (augmented_assignment_expression
@@ -84,6 +90,9 @@
 (update_expression
   argument: (identifier) @variable.other.assignment.js)
 
+(field_definition
+  property: (private_property_identifier) @variable.other.assignment.property.private.js)
+
 ; `object_pattern` appears to only be encountered in assignment expressions, so
 ; this won't match other uses of object/prop shorthand.
 ;
@@ -136,6 +145,13 @@
   (array_pattern
     (identifier) @variable.other.assignment.destructuring.js))
 
+; A variable array destructuring with a default:
+; The "baz" in `let [foo, bar, baz = false] = something`
+(variable_declarator
+  (array_pattern
+    (assignment_pattern
+      (identifier) @variable.other.assignment.destructuring.js)))
+
 ; A variable declaration in a for…(in|of) loop:
 ; The "foo" in `for (let foo of bar) {`
 (for_in_statement
@@ -203,7 +219,7 @@
 ; The "foo" in `function (foo = false) {`.
 (formal_parameters
   (assignment_pattern
-    (identifier) @variable.parameter.js))
+    left: (identifier) @variable.parameter.js))
 
 
 ; FUNCTIONS
@@ -451,6 +467,10 @@
 (member_expression
   property: (property_identifier) @support.other.property.js)
 
+; The "#bar" in `foo.#bar`, `foo.#bar.baz`, and `foo.#bar[baz]`.
+(member_expression
+  property: (private_property_identifier) @support.other.property.private.js)
+
 ; The "BAR" in `foo.BAR` should also be scoped as a constant.
 (member_expression
   property: (property_identifier) @constant.other.property.js