Tree-sitter rolling fixes, 1.129 edition (#1300)

* Fix a bug in `tree-sitter-scss`…

…where `color:red;` was interpreted as a tag and pseudoclass instead of a property-value pair.

* [language-sass] Add grammar spec for fixed issue in `tree-sitter-scss`

* [language-typescript] Highlight `abstract` modifier properly…

…plus the names of abstract methods in class definitions.

Author: savetheclocktower

packages/language-sass/grammars/modern-tree-sitter-scss.cson

@@ -15,7 +15,7 @@ fileTypes: [
 injectionRegex: '^(scss|SCSS)$'
 
 treeSitter:
-  parserSource: 'github:savetheclocktower/tree-sitter-scss#090d25a5fc829ce6956201cf55ab6b6eacad999c'
+  parserSource: 'github:savetheclocktower/tree-sitter-scss#f5dfc3b4609d01fb11af8c97f3948fffeff25e92'
   grammar: 'tree-sitter/tree-sitter-scss.wasm'
   highlightsQuery: 'tree-sitter/highlights.scm'
   foldsQuery: 'tree-sitter/folds.scm'

packages/language-sass/grammars/tree-sitter/tree-sitter-scss.wasm

@@ -0,0 +1,14 @@
+{
+  "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-sass/spec/.eslintrc

@@ -0,0 +1,9 @@
+
+div {
+  color: red;
+  // ^ support.type.property-name.scss
+  //     ^ support.constant.color
+  color:red;
+  // ^ support.type.property-name.scss
+  //     ^ support.constant.color
+}

packages/language-sass/spec/fixtures/grammar/test.scss

@@ -0,0 +1,18 @@
+const path = require('path');
+
+const GRAMMAR_TEST_FILES = [
+  'test.scss'
+];
+
+describe('Grammar tests', () => {
+  beforeEach(async () => {
+    atom.config.set('core.useTreeSitterParsers', true);
+    await atom.packages.activatePackage("language-sass");
+  });
+
+  it('passes grammar tests', async () => {
+    for (let file of GRAMMAR_TEST_FILES) {
+      await runGrammarTests(path.join(__dirname, 'fixtures', 'grammar', file), /\/\//)
+    }
+  });
+});

packages/language-sass/spec/grammar-spec.js

@@ -407,6 +407,7 @@
   "protected"
   "readonly"
   "satisfies"
+  "abstract"
 ] @storage.modifier._TYPE_._LANG_
 
 (index_signature
@@ -718,6 +719,10 @@
   key: (property_identifier) @entity.name.function.method.definition._LANG_
   value: [(function_expression) (arrow_function)])
 
+; Abstract function declaration:
+; The "foo" in `abstract foo(): void`
+(abstract_method_signature name: (_) @entity.name.function.method.definition.abstract._LANG_)
+
 ; Function is `storage.type` because it's a core language construct.
 (function_expression "function" @storage.type.function._LANG_)
 (function_declaration "function" @storage.type.function._LANG_)