Sync with language-javascript

See atom/language-javascript#620
atom · Nov 8, 2018 · acbe8ef · acbe8ef
1 parent 28333f9
commit acbe8ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/grammars/tree-sitter-flow.cson b/grammars/tree-sitter-flow.cson
@@ -97,7 +97,7 @@ scopes:
     'entity.name.function'
   ]
 
-  'call_expression > super': 'support.function'
+  'call_expression > super': 'support.function.super'
 
   'method_definition > property_identifier': 'entity.name.function'
   'call_expression > member_expression > property_identifier': 'entity.name.function'
@@ -144,6 +144,9 @@ scopes:
   '")"': 'punctuation.definition.parameters.end.bracket.round'
   '"{"': 'punctuation.definition.function.body.begin.bracket.curly'
   '"}"': 'punctuation.definition.function.body.end.bracket.curly'
+  '";"': 'punctuation.terminator.statement.semicolon'
+  '"["': 'punctuation.definition.array.begin.bracket.square'
+  '"]"': 'punctuation.definition.array.end.bracket.square'
 
   '"var"': 'storage.type'
   '"let"': 'storage.type'
@@ -152,7 +155,7 @@ scopes:
   '"const"': 'storage.modifier'
   '"static"': 'storage.modifier'
   '"function"': 'storage.type.function'
-  '"=>"': 'storage.type.function'
+  '"=>"': 'storage.type.function.arrow'
 
   '"="': 'keyword.operator.js'
   '"+="': 'keyword.operator.js'
@@ -207,6 +210,7 @@ scopes:
   '"."': 'meta.delimiter.period'
   '","': 'meta.delimiter.comma'
 
+  '"as"': 'keyword.modifier'
   '"if"': 'keyword.control'
   '"do"': 'keyword.control'
   '"else"': 'keyword.control'
@@ -245,7 +249,6 @@ scopes:
     function_signature > identifier
   ': 'entity.name.function'
 
-  '"as"': 'keyword.modifier'
   '"implements"': 'keyword.modifier'
   '"namespace"': 'keyword.modifier'
   '"enum"': 'keyword.modifier'
@@ -254,5 +257,6 @@ scopes:
   '"declare"': 'keyword.modifier'
   '"public"': 'keyword.modifier'
   '"private"': 'keyword.modifier'
+  '"protected"': 'keyword.modifier'
   'readonly': 'keyword.modifier'
   '"type"': 'keyword.modifier'
diff --git a/grammars/tree-sitter-typescript.cson b/grammars/tree-sitter-typescript.cson
@@ -89,7 +89,7 @@ scopes:
     'entity.name.function'
   ]
 
-  'call_expression > super': 'support.function'
+  'call_expression > super': 'support.function.super'
 
   'method_definition > property_identifier': 'entity.name.function'
   'call_expression > member_expression > property_identifier': 'entity.name.function'
@@ -136,6 +136,9 @@ scopes:
   '")"': 'punctuation.definition.parameters.end.bracket.round'
   '"{"': 'punctuation.definition.function.body.begin.bracket.curly'
   '"}"': 'punctuation.definition.function.body.end.bracket.curly'
+  '";"': 'punctuation.terminator.statement.semicolon'
+  '"["': 'punctuation.definition.array.begin.bracket.square'
+  '"]"': 'punctuation.definition.array.end.bracket.square'
 
   '"var"': 'storage.type'
   '"let"': 'storage.type'
@@ -144,7 +147,7 @@ scopes:
   '"const"': 'storage.modifier'
   '"static"': 'storage.modifier'
   '"function"': 'storage.type.function'
-  '"=>"': 'storage.type.function'
+  '"=>"': 'storage.type.function.arrow'
 
   '"="': 'keyword.operator.js'
   '"+="': 'keyword.operator.js'
@@ -199,6 +202,7 @@ scopes:
   '"."': 'meta.delimiter.period'
   '","': 'meta.delimiter.comma'
 
+  '"as"': 'keyword.control'
   '"if"': 'keyword.control'
   '"do"': 'keyword.control'
   '"else"': 'keyword.control'
@@ -237,7 +241,6 @@ scopes:
     function_signature > identifier
   ': 'entity.name.function'
 
-  '"as"': 'keyword.modifier'
   '"implements"': 'keyword.modifier'
   '"namespace"': 'keyword.modifier'
   '"enum"': 'keyword.modifier'
@@ -246,5 +249,6 @@ scopes:
   '"declare"': 'keyword.modifier'
   '"public"': 'keyword.modifier'
   '"private"': 'keyword.modifier'
+  '"protected"': 'keyword.modifier'
   'readonly': 'keyword.modifier'
   '"type"': 'keyword.modifier'