Merge pull request #735 from savetheclocktower/tree-sitter-september-fixes

Tree-sitter running fixes for September

packages/base16-tomorrow-dark-theme/styles/syntax-legacy/_base.less

@@ -186,7 +186,7 @@
 }
 
 .syntax--meta {
-  &.syntax--class {
+  &.syntax--class:not(.syntax--block) {
     color: @yellow;
 
     &.syntax--body {

packages/base16-tomorrow-light-theme/styles/syntax-legacy/_base.less

@@ -186,7 +186,7 @@
 }
 
 .syntax--meta {
-  &.syntax--class {
+  &.syntax--class:not(.syntax--block) {
     color: @yellow;
 
     &.syntax--body {

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

@@ -43,18 +43,18 @@
   (type_identifier) @_IGNORE_
   (#set! capture.final true))
 
-(primitive_type) @storage.type.builtin.c
-(type_identifier) @storage.type.other.c
+(primitive_type) @support.type.builtin.c
+(type_identifier) @support.type.other.c
 
 ; These types are all reserved words; if we see an identifier with this name,
 ; it must be a type.
-((identifier) @storage.type.builtin.c
-  (#match? @storage.type.builtin.c "^(char|int|float|double|long)$"))
+((identifier) @support.type.builtin.c
+  (#match? @support.type.builtin.c "^(char|int|float|double|long)$"))
 
 ; Assume any identifier that ends in `_t` is a type. This convention is not
 ; always followed, but it's a very strong indicator when it's present.
-((identifier) @storage.type.other.c
-  (#match? @storage.type.other.c "_t$"))
+((identifier) @support.type.other.c
+  (#match? @support.type.other.c "_t$"))
 
 [
   "enum"

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

@@ -49,24 +49,31 @@
   (#set! capture.final true))
 
 
-(primitive_type) @storage.type.builtin.cpp
+(primitive_type) @support.type.builtin.cpp
+
+; Type parameters
+(template_argument_list
+  (type_descriptor
+    type: (type_identifier) @variable.parameter.type.cpp
+    (#set! capture.final true)))
+
 
 (class_specifier
   (type_identifier) @entity.name.class.cpp
   (#set! capture.final true))
 
-(type_identifier) @storage.type.other.cpp
+(type_identifier) @support.type.other.cpp
 ; (struct_specifier) @storage.type.cpp
 
 ; These types are all reserved words; if we see an identifier with this name,
 ; it must be a type.
-((identifier) @storage.type.builtin.cpp
-  (#match? @storage.type.builtin.cpp "^(char|int|float|double|long)$"))
+((identifier) @support.type.builtin.cpp
+  (#match? @support.type.builtin.cpp "^(char|int|float|double|long)$"))
 
 ; Assume any identifier that ends in `_t` is a type. This convention is not
 ; always followed, but it's a very strong indicator when it's present.
-((identifier) @storage.type.other.cpp
-  (#match? @storage.type.other.cpp "_t$"))
+((identifier) @support.type.other.cpp
+  (#match? @support.type.other.cpp "_t$"))
 
 
 [

packages/language-shellscript/grammars/modern-tree-sitter-bash.cson

@@ -21,6 +21,9 @@ firstLineRegex: [
 injectionRegex: '(^(bash|BASH)$|sh^|SH^)'
 
 treeSitter:
+  # Grammar generated on 2023-09-22 from commit:
+  # fd4e40dab883d6456da4d847de8321aee9c80805
+  parserSource: 'github:tree-sitter/tree-sitter-bash#fd4e40dab883d6456da4d847de8321aee9c80805'
   grammar: 'tree-sitter/tree-sitter-bash.wasm'
   highlightsQuery: 'tree-sitter/highlights.scm'
   tagsQuery: 'tree-sitter/tags.scm'

packages/one-dark-syntax/styles/syntax-legacy/_base.less

@@ -210,7 +210,7 @@
 }
 
 .syntax--meta {
-  &.syntax--class {
+  &.syntax--class:not(.syntax--block) {
     color: @hue-6-2;
 
     &.syntax--body {

packages/one-light-syntax/styles/syntax-legacy/_base.less

@@ -210,7 +210,7 @@
 }
 
 .syntax--meta {
-  &.syntax--class {
+  &.syntax--class:not(.syntax--block) {
     color: @hue-6-2;
 
     &.syntax--body {