Merge pull request #1101 from pulsar-edit/tree-sitter-october

Tree-sitter rolling fixes, 1.122 edition
pulsar-edit · Oct 16, 2024 · a2c236f · a2c236f
2 parents 1ef8b8e + 3b80398
commit a2c236f
Show file tree

Hide file tree

Showing 17 changed files with 1,227 additions and 932 deletions.
diff --git a/packages/language-c/grammars/common/highlights.scm b/packages/language-c/grammars/common/highlights.scm
diff --git a/packages/language-c/grammars/modern-tree-sitter-c.cson b/packages/language-c/grammars/modern-tree-sitter-c.cson
@@ -9,7 +9,11 @@ injectionRegex: '^(c|C)$'
 treeSitter:
   parserSource: 'github:tree-sitter/tree-sitter-c#212a80f86452bb1316324fa0db730cf52f29e05a'
   grammar: 'tree-sitter-c/tree-sitter-c.wasm'
-  highlightsQuery: 'tree-sitter-c/highlights.scm'
+  languageSegment: 'c'
+  highlightsQuery: [
+    'common/highlights.scm'
+    'tree-sitter-c/highlights.scm'
+  ]
   tagsQuery: 'tree-sitter-c/tags.scm'
   foldsQuery: 'tree-sitter-c/folds.scm'
   indentsQuery: 'tree-sitter-c/indents.scm'

diff --git a/packages/language-c/grammars/modern-tree-sitter-cpp.cson b/packages/language-c/grammars/modern-tree-sitter-cpp.cson
@@ -8,7 +8,11 @@ injectionRegex: '^(c|C)(\\+\\+|pp|PP)$'
 treeSitter:
   parserSource: 'github:tree-sitter/tree-sitter-cpp#a71474021410973b29bfe99440d57bcd750246b1'
   grammar: 'tree-sitter-cpp/tree-sitter-cpp.wasm'
-  highlightsQuery: 'tree-sitter-cpp/highlights.scm'
+  languageSegment: 'cpp'
+  highlightsQuery: [
+    'common/highlights.scm'
+    'tree-sitter-cpp/highlights.scm'
+  ]
   tagsQuery: 'tree-sitter-cpp/tags.scm'
   foldsQuery: 'tree-sitter-cpp/folds.scm'
   indentsQuery: 'tree-sitter-cpp/indents.scm'