Merge pull request #1085 from pulsar-edit/tree-sitter-august

Tree-sitter rolling fixes: 1.121 edition

packages/language-css/grammars/modern-tree-sitter-css.cson

@@ -8,7 +8,7 @@ fileTypes: [
 ]
 
 treeSitter:
-  parserSource: 'github:tree-sitter/tree-sitter-css#98c7b3dceb24f1ee17f1322f3947e55638251c37'
+  parserSource: 'github:tree-sitter/tree-sitter-css#9af0bdd9d225edee12f489cfa8284e248321959b'
   grammar: 'tree-sitter/tree-sitter-css.wasm'
   highlightsQuery: 'tree-sitter/queries/highlights.scm'
   foldsQuery: 'tree-sitter/queries/folds.scm'

packages/language-gfm/grammars/modern-tree-sitter-gfm-inline.cson

@@ -5,6 +5,6 @@ parser: 'tree-sitter-markdown_inline'
 injectionRegex: '^(markdown-inline-internal)$'
 
 treeSitter:
-  parserSource: 'github:MDeiml/tree-sitter-markdown/tree-sitter-markdown-inline#28aa3baef73bd458d053b613b8bd10fd102b4405'
+  parserSource: 'github:tree-sitter-grammars/tree-sitter-markdown/tree-sitter-markdown-inline#a3481e1db0b5f9aecfa7124d362a6485286a8e72'
   grammar: 'tree-sitter-markdown-inline/tree-sitter-markdown-inline.wasm'
   highlightsQuery: 'tree-sitter-markdown-inline/highlights.scm'

packages/language-gfm/grammars/modern-tree-sitter-gfm.cson

@@ -6,7 +6,7 @@ parser: 'tree-sitter-markdown'
 injectionRegex: '^(markdown|MARKDOWN|gfm|GFM)$'
 
 treeSitter:
-  parserSource: 'github:MDeiml/tree-sitter-markdown/tree-sitter-markdown#28aa3baef73bd458d053b613b8bd10fd102b4405'
+  parserSource: 'github:tree-sitter-grammars/tree-sitter-markdown/tree-sitter-markdown#a3481e1db0b5f9aecfa7124d362a6485286a8e72'
   grammar: 'tree-sitter-markdown/tree-sitter-markdown.wasm'
   highlightsQuery: 'tree-sitter-markdown/highlights.scm'
   foldsQuery: 'tree-sitter-markdown/folds.scm'

packages/language-html/grammars/modern-tree-sitter-ejs.cson

@@ -11,7 +11,7 @@ fileTypes: [
 injectionRegex: '^(ejs|EJS)$'
 
 treeSitter:
-  parserSource: 'github:tree-sitter/tree-sitter-embedded-template#203f7bd3c1bbfbd98fc19add4b8fcb213c059205'
+  parserSource: 'github:tree-sitter/tree-sitter-embedded-template#v0.23.0'
   grammar: 'tree-sitter-embedded-template/tree-sitter-embedded-template.wasm'
   highlightsQuery: 'tree-sitter-embedded-template/ejs/highlights.scm'
   foldsQuery: 'tree-sitter-embedded-template/ejs/folds.scm'

packages/language-html/grammars/modern-tree-sitter-erb.cson

@@ -11,7 +11,7 @@ fileTypes: [
 injectionRegex: '^(erb|ERB)$'
 
 treeSitter:
-  parserSource: 'github:tree-sitter/tree-sitter-embedded-template#203f7bd3c1bbfbd98fc19add4b8fcb213c059205'
+  parserSource: 'github:tree-sitter/tree-sitter-embedded-template#v0.23.0'
   grammar: 'tree-sitter-embedded-template/tree-sitter-embedded-template.wasm'
   highlightsQuery: 'tree-sitter-embedded-template/erb/highlights.scm'
   foldsQuery: 'tree-sitter-embedded-template/erb/folds.scm'

packages/language-html/grammars/modern-tree-sitter-html.cson

@@ -6,7 +6,7 @@ parser: 'tree-sitter-html'
 injectionRegex: '(HTML|html|Html)$'
 
 treeSitter:
-  parserSource: 'github:tree-sitter/tree-sitter-html#d742025fa2d8e6100f134a6ea990443aa1f074b3'
+  parserSource: 'github:tree-sitter/tree-sitter-html#v0.23.0'
   grammar: 'tree-sitter-html/tree-sitter-html.wasm'
   highlightsQuery: 'tree-sitter-html/highlights.scm'
   foldsQuery: 'tree-sitter-html/folds.scm'

packages/language-java/grammars/tree-sitter-java/highlights.scm

@@ -177,7 +177,10 @@
 
 (throws "throws" @storage.modifier.throws.java)
 
-(method_invocation (identifier)
+(method_invocation object: (identifier)
+  @support.other.object.java)
+
+(method_invocation name: (identifier)
   @support.other.function.java)
 
 (field_access (identifier) @constant.other.java

packages/language-javascript/grammars/modern-tree-sitter-javascript.cson

@@ -6,7 +6,7 @@ parser: 'tree-sitter-javascript'
 injectionRegex: '^(js|javascript|JS|JAVASCRIPT)$'
 
 treeSitter:
-  parserSource: 'github:tree-sitter/tree-sitter-javascript#f1e5a09b8d02f8209a68249c93f0ad647b228e6e'
+  parserSource: 'github:tree-sitter/tree-sitter-javascript#v0.23.0'
   grammar: 'tree-sitter/tree-sitter-javascript.wasm'
   highlightsQuery: 'tree-sitter/highlights.scm'
   localsQuery: 'tree-sitter/locals.scm'

packages/language-javascript/grammars/tree-sitter/highlights.scm

@@ -1,23 +1,29 @@
 ; MISC
 ; ====
 
-; In the JSX construct `<FOO.Bar>`, `FOO` should not be marked as
-; `constant.other.js`. Block off identifiers within complex JSX tag names early
-; to prevent this.
+; In the JSX construct `<Foo.Bar>`, `Foo.Bar` is treated as a
+; `member_expression`. We don't want the ordinary rules for member expressions
+; to apply, so we block them off.
+;
+; TODO: If we wanted to give these segments individual scopes, we'd do that
+; here — replacing the `@_IGNORE_`s with scope names.
 
 (jsx_opening_element
   (member_expression
     (identifier) @_IGNORE_
+    (property_identifier) @_IGNORE_
       (#set! capture.final)))
 
 (jsx_closing_element
   (member_expression
     (identifier) @_IGNORE_
+    (property_identifier) @_IGNORE_
       (#set! capture.final)))
 
 (jsx_self_closing_element
   (member_expression
     (identifier) @_IGNORE_
+    (property_identifier) @_IGNORE_
       (#set! capture.final)))
 
 
@@ -98,7 +104,7 @@
 (assignment_expression
   left: (member_expression
     property: (property_identifier) @variable.other.assignment.property.js)
-  right: [(arrow_function) (function)] @_IGNORE_
+  right: [(arrow_function) (function_expression)] @_IGNORE_
     (#set! isFunctionProperty true))
 
 ; The "bar" in `foo.bar = true`.
@@ -117,10 +123,25 @@
 (augmented_assignment_expression
   left: (identifier) @variable.other.assignment.js)
 
+; The "bar" in `foo.bar += 1`.
+(augmented_assignment_expression
+  left: (member_expression
+    property: (property_identifier) @variable.other.assignment.property.js)
+    (#is-not? test.rangeWithData isFunctionProperty)
+    (#set! capture.final))
+
 ; The "foo" in `foo++`.
 (update_expression
   argument: (identifier) @variable.other.assignment.js)
 
+; The "bar" in `foo.bar++`.
+(update_expression
+  argument: (member_expression
+    property: (property_identifier) @variable.other.assignment.property.js)
+    (#is-not? test.rangeWithData isFunctionProperty)
+    (#set! capture.final))
+
+
 ; Public field definition in a class body:
 ; The "foo" in `foo = "bar";`
 (field_definition
@@ -264,7 +285,7 @@
 
 ; Named function expressions:
 ; the "foo" in `let bar = function foo () {`
-(function
+(function_expression
   name: (identifier) @entity.name.function.definition.js)
 
 ; Function definitions:
@@ -298,27 +319,27 @@
   left: (member_expression
     property: (property_identifier) @entity.name.function.definition.js
     (#set! capture.final true))
-  right: [(arrow_function) (function)])
+  right: [(arrow_function) (function_expression)])
 
 ; Function variable assignment:
 ; The "foo" in `let foo = function () {`
 (variable_declarator
   name: (identifier) @entity.name.function.definition.js
-  value: [(function) (arrow_function)])
+  value: [(function_expression) (arrow_function)])
 
 ; Function variable reassignment:
 ; The "foo" in `foo = function () {`
 (assignment_expression
   left: (identifier) @function
-  right: [(function) (arrow_function)])
+  right: [(function_expression) (arrow_function)])
 
 ; Object key-value pair function:
 ; The "foo" in `{ foo: function () {} }`
 (pair
   key: (property_identifier) @entity.name.function.method.definition.js
-  value: [(function) (arrow_function)])
+  value: [(function_expression) (arrow_function)])
 
-(function "function" @storage.type.function.js)
+(function_expression "function" @storage.type.function.js)
 (function_declaration "function" @storage.type.function.js)
 
 (generator_function "function" @storage.type.function.js)
@@ -995,7 +1016,7 @@
   (#set! adjust.endAt lastChild.startPosition)
   (#set! capture.final true))
 
-(function
+(function_expression
   body: (statement_block) @meta.block.function.js
   (#set! adjust.startAt firstChild.endPosition)
   (#set! adjust.endAt lastChild.startPosition)

packages/language-javascript/grammars/tree-sitter/tags.scm

@@ -28,7 +28,7 @@
   (comment)* @doc
   .
   [
-    (function
+    (function_expression
       name: (identifier) @name)
     (function_declaration
       name: (identifier) @name)
@@ -47,7 +47,7 @@
   (lexical_declaration
     (variable_declarator
       name: (identifier) @name
-      value: [(arrow_function) (function)]) @definition.function)
+      value: [(arrow_function) (function_expression)]) @definition.function)
   (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
   (#select-adjacent! @doc @definition.function)
 )
@@ -58,7 +58,7 @@
   (variable_declaration
     (variable_declarator
       name: (identifier) @name
-      value: [(arrow_function) (function)]) @definition.function)
+      value: [(arrow_function) (function_expression)]) @definition.function)
   (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
   (#select-adjacent! @doc @definition.function)
 )
@@ -69,12 +69,12 @@
     (member_expression
       property: (property_identifier) @name)
   ]
-  right: [(arrow_function) (function)]
+  right: [(arrow_function) (function_expression)]
 ) @definition.function
 
 (pair
   key: (property_identifier) @name
-  value: [(arrow_function) (function)]) @definition.function
+  value: [(arrow_function) (function_expression)]) @definition.function
 
 (
   (call_expression

packages/language-javascript/lib/main.js

@@ -21,27 +21,27 @@ exports.activate = function () {
     content(callExpression) {
       const { lastChild } = callExpression;
       if (lastChild.type === 'template_string') {
-        return lastChild;
+        return stringFragmentsOfTemplateString(lastChild);
       }
     }
   });
 
   atom.grammars.addInjectionPoint('source.js', {
     type: 'assignment_expression',
 
-    language(callExpression) {
-      const { firstChild } = callExpression;
+    language(expression) {
+      const { firstChild } = expression;
       if (firstChild.type === 'member_expression') {
         if (firstChild.lastChild.text === 'innerHTML') {
           return 'html';
         }
       }
     },
 
-    content(callExpression) {
-      const { lastChild } = callExpression;
+    content(expression) {
+      const { lastChild } = expression;
       if (lastChild.type === 'template_string') {
-        return lastChild;
+        return stringFragmentsOfTemplateString(lastChild);
       }
     }
   });
@@ -95,3 +95,9 @@ function languageStringForTemplateTag(tag) {
     return tag;
   }
 }
+
+function stringFragmentsOfTemplateString(templateStringNode) {
+  return templateStringNode.children.filter(
+    c => c.type === 'string_fragment'
+  );
+}

packages/language-php/grammars/tree-sitter/queries/highlights.scm

@@ -408,7 +408,11 @@
 (const_declaration (const_element) @variable.other.constant.php)
 
 ((name) @constant.language.php
- (#match? @constant.language.php "^__[A-Z][A-Z\d_]+__$"))
+  (#match? @constant.language.php "\\b(__(FILE|DIR|FUNCTION|CLASS|METHOD|LINE|NAMESPACE)__|ON|OFF|YES|NO|NL|BR|TAB)\\b")
+  (#set! capture.final))
+
+((name) @constant.language.php
+  (#match? @constant.language.php "^__[A-Z][A-Z\d_]+__$"))
 
 (argument
   name: (_) @variable.other.named-argument.php
@@ -489,8 +493,34 @@
 ; =========
 
 (boolean) @constant.language.boolean._TEXT_.php
+
+; In PHP, `true` is technically no different from `TRUE` or `True`; they appear
+; to be implemented as case-insensitive language constants. `tree-sitter-php`
+; treats `true` as a `boolean` node, but `TRUE` and `True` as `name` nodes.
+;
+; This is silly — but, as usual, the origin of the silliness is PHP.
+;
+; `#match?` is case-sensitive and there's no way to opt out of that. At some
+; point in the future, we might be able to fix that by defining a custom
+; predicate for case-insensitive `#match?`; for now we'll just write a silly
+; regex.
+
+((name) @constant.language.boolean.true.php
+  (#match? @constant.language.boolean.true.php "^[Tt][Rr][Uu][Ee]$")
+  (#set! capture.final))
+
+((name) @constant.language.boolean.false.php
+  (#match? @constant.language.boolean.false.php "^[Ff][Aa][Ll][Ss][Ee]$")
+  (#set! capture.final))
+
 (null) @constant.language.null.php
 
+; Likewise, `null` is a case-insensitive constant. `NULL` and `null` are common;
+; others are less common, but we might as well cover them.
+((name) @constant.language.null.php
+  (#match? @constant.language.null.php "^[Nn][Uu][Ll][Ll]")
+  (#set! capture.final))
+
 (integer) @constant.numeric.decimal.integer.php
 (float) @constant.numeric.decimal.float.php