Tree-sitter rolling fixes, 1.130.0 edition

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

@@ -845,20 +845,33 @@
 
 ; The "Foo" in `<Foo />`.
 (jsx_self_closing_element
-  name: (_) @entity.name.tag.js
+  name: (_) @entity.name.tag.jsx.js
   ) @meta.tag.jsx.js
 
 ; The "Foo" in `<Foo>`.
 (jsx_opening_element
-  name: (_) @entity.name.tag.js)
+  name: (_) @entity.name.tag.jsx.js)
 
 ; The "Foo" in `</Foo>`.
 (jsx_closing_element
-  name: (_) @entity.name.tag.js)
+  name: (_) @entity.name.tag.jsx.js)
 
 ; The "bar" in `<Foo bar={true} />`.
 (jsx_attribute
-  (property_identifier) @entity.other.attribute-name.js)
+  (property_identifier) @entity.other.attribute-name.jsx.js)
+
+; The "wat:bar" in `<Foo wat:bar={true} />`.
+(jsx_attribute
+  (jsx_namespace_name
+    (identifier)) @entity.other.attribute-name.namespaced.jsx.js)
+
+; The "wat" in `<Foo wat:bar={true} />`. Worth tagging with its own scope name
+; just in case a theme wants to highlight the namespace differently from the
+; rest of the attribute.
+(jsx_attribute
+  (jsx_namespace_name
+    (identifier) @meta.attribute-namespace.jsx.js
+    (#is-not? test.last)))
 
 ; All JSX expressions/interpolations within braces.
 ((jsx_expression) @meta.embedded.block.jsx.js

packages/language-javascript/spec/fixtures/.eslintignore

@@ -0,0 +1 @@
+sample.js

packages/language-javascript/spec/fixtures/sample.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /* eslint-disable */
 function diff(obj1, obj2, pathConverter) {
 // ^ storage.type.function
@@ -234,3 +235,12 @@ module.exports = diff;
                   // ^ punctuation.terminator.statement
 
 /* eslint-enable */
+
+function SomeComponent () {
+  return <Button icon="code" on:click={props.openFile} />;
+//       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.jsx.js
+//        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.jsx.inside-tag.js
+//        ^^^^^^ entity.name.tag.jsx.js
+//                           ^^ meta.attribute-namespace.jsx.js
+//                           ^^^^^^^^ entity.other.attribute-name.namespaced.jsx.js
+}

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

@@ -274,6 +274,8 @@
   "try"
 ] @keyword.control.exception._TYPE_.python
 
+("except*" @keyword.control.exception.group-clause.python)
+
 [
   "global"
   "nonlocal"
@@ -312,6 +314,10 @@
     (identifier) @variable.parameter.function.python))
 
 
+; The "foo" in `except TypeError as foo:`.
+(as_pattern_target
+  (identifier) @variable.other.exception.python)
+
 ; `self` and `cls` are just conventions, but they are _strong_ conventions.
 ((identifier) @variable.language.self.python
   (#eq? @variable.language.self.python "self")

packages/language-typescript/grammars/common/highlights.scm

@@ -440,6 +440,7 @@
 ; Any other type identifiers; the "Bar" in `const foo: Bar`.
 (type_identifier) @support.storage.other.type._LANG_
 
+
 ; SUPPORT
 ; =======
 
@@ -786,7 +787,53 @@
 (template_substitution
   "${" @punctuation.section.embedded.begin._LANG_
   "}" @punctuation.section.embedded.end._LANG_
-) @meta.embedded.line.interpolation._LANG_
+)
+
+; Scope interpolations with `meta.embedded.line` if they start and end on the
+; same line…
+((template_substitution) @meta.embedded.line.interpolation._LANG_
+  (#is? test.startsOnSameRowAs endPosition))
+
+; …or `meta.embedded.block` if they start and end on different lines.
+((template_substitution) @meta.embedded.block.interpolation._LANG_
+  (#is-not? test.startsOnSameRowAs endPosition))
+
+
+; Template literal types allow you to do string manipulation on values. They're
+; basically strings, so let's highlight them that way.
+;
+; Example:
+;
+; type World = "world";
+; type Greeting = `hello ${World}`;
+(template_literal_type) @string.quoted.backtick._LANG_
+(template_literal_type "`" @punctuation.delimiter.string.begin._LANG_
+  (#is? test.first))
+(template_literal_type "`" @punctuation.delimiter.string.end._LANG_
+  (#is? test.last))
+
+; The `template_type` node is used when there's an interpolation within a
+; template literal type.
+(template_literal_type
+  (template_type
+    "${" @punctuation.section.embedded.begin._LANG_
+    "}" @punctuation.section.embedded.end._LANG_
+  )
+)
+
+; Scope interpolations with `meta.embedded.line` if they start and end on the
+; same line…
+(template_literal_type
+  (template_type) @meta.embedded.line.interpolation._LANG_
+  (#is? test.startsOnSameRowAs endPosition)
+)
+
+; …or `meta.embedded.block` if they start and end on different lines.
+(template_literal_type
+  (template_type) @meta.embedded.block.interpolation._LANG_
+  (#is-not? test.startsOnSameRowAs endPosition)
+)
+
 
 (string
   (escape_sequence) @constant.character.escape._LANG_)

packages/language-typescript/grammars/tree-sitter-tsx/highlights.scm

@@ -59,6 +59,19 @@
 (jsx_attribute
   (property_identifier) @entity.other.attribute-name.ts.tsx)
 
+; The "wat:bar" in `<Foo wat:bar={true} />`.
+(jsx_attribute
+  (jsx_namespace_name
+    (identifier)) @entity.other.attribute-name.namespaced.ts.tsx)
+
+; The "wat" in `<Foo wat:bar={true} />`. Worth tagging with its own scope name
+; just in case a theme wants to highlight the namespace differently from the
+; rest of the attribute.
+(jsx_attribute
+  (jsx_namespace_name
+    (identifier) @meta.attribute-namespace.ts.tsx
+    (#is-not? test.last)))
+
 ; All JSX expressions/interpolations within braces.
 ((jsx_expression) @meta.embedded.block.ts.tsx
   (#match? @meta.embedded.block.ts.tsx "\\n")

packages/language-typescript/spec/.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  env: { jasmine: true },
+  globals: {
+    waitsForPromise: true,
+    runGrammarTests: true,
+    runFoldsTests: true
+  },
+  rules: {
+    "node/no-unpublished-require": "off",
+    "node/no-extraneous-require": "off",
+    "no-unused-vars": "off",
+    "no-empty": "off"
+  }
+};

packages/language-typescript/spec/fixtures/.eslintignore

@@ -0,0 +1,2 @@
+sample.ts
+sample.tsx

packages/language-typescript/spec/fixtures/sample.ts

@@ -0,0 +1,14 @@
+// @ts-nocheck
+/* eslint-disable */
+
+type World = "world";
+// <- storage.type.ts
+//   ^^^^^ support.storage.other.type.ts
+//           ^^^^^^^ string.quoted.double.ts
+
+
+type Greeting = `hello ${World}`;
+//              ^^^^^^^^^^^^^^^^ string.quoted.backtick.ts
+//                     ^^^^^^^^  meta.embedded.line.interpolation.ts
+//                     ^^ punctuation.section.embedded.begin.ts
+//                            ^ punctuation.section.embedded.end.ts

packages/language-typescript/spec/fixtures/sample.tsx

@@ -0,0 +1,9 @@
+// @ts-nocheck
+function SomeComponent () {
+  return <Button icon="code" on:click={props.openFile} />;
+//       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.ts.tsx
+//        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.jsx.inside-tag.ts.tsx
+//        ^^^^^^ entity.name.tag.ts.tsx
+//                           ^^ meta.attribute-namespace.ts.tsx
+//                           ^^^^^^^^ entity.other.attribute-name.namespaced.ts.tsx
+}

packages/language-typescript/spec/tree-sitter-grammar-spec.js

@@ -0,0 +1,20 @@
+const path = require('path');
+
+describe('WASM Tree-sitter TypeScript grammar', () => {
+
+  beforeEach(async () => {
+    await atom.packages.activatePackage('language-typescript');
+  });
+
+  describe('regular grammar', () => {
+    it('passes grammar tests', async () => {
+      await runGrammarTests(path.join(__dirname, 'fixtures', 'sample.ts'), /\/\//)
+    });
+  });
+
+  describe('TSX grammar', () => {
+    it('passes grammar tests', async () => {
+      await runGrammarTests(path.join(__dirname, 'fixtures', 'sample.tsx'), /\/\//)
+    });
+  });
+});

src/wasm-tree-sitter-language-mode.js

@@ -5256,9 +5256,26 @@ class IndentResolver {
     //
     // Use the position of the first text on the line as the reference point.
     let rowStartingColumn = Math.max(line.search(/\S/), 0);
+    let rowStartingPoint = new Point(row, rowStartingColumn)
     let controllingLayer = languageMode.controllingLayerAtPoint(
-      new Point(row, rowStartingColumn),
-      (layer) => !!layer.queries.indentsQuery
+      rowStartingPoint,
+      (layer) => {
+        if (!layer.queries.indentsQuery) return false;
+        // We're using the same logic here that we used in the dedent phase of
+        // `suggestedIndentForBufferRow`: allow layers that _begin_ at the
+        // cursor, but exclude layers that _end_ at the cursor.
+        //
+        // So first we test for containment exclusive of endpoints…
+        if (layer.containsPoint(rowStartingPoint, true)) {
+          return true;
+        }
+
+        // …but we'll still accept layers that have a content range which
+        // _starts_ at the cursor position.
+        return layer.getCurrentRanges()?.some(r => {
+          return r.start.compare(rowStartingPoint) === 0;
+        });
+      }
     );
 
     if (!controllingLayer) { return undefined; }