Solving Issue 37, changing scopes of major keywords, changing scope of switch statement, modified type-annotation to allow typeof keyword

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -53,7 +53,7 @@ repository:
     patterns:
       - include: '#type-parameters'
       - include: '#type'
-      - name: keyword.operator.ts
+      - name: keyword.operator.comparison.ts
         match: '=\s*'
 
   enum-declaration:
@@ -68,7 +68,7 @@ repository:
     name: meta.declaration.object.ts
     begin: '\b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(class|interface)\b'
     beginCaptures:
-      '1': { name: storage.modifier.ts }
+      '1': { name: storage.type.ts }
       '2': { name: storage.modifier.ts }
       '3': { name: storage.type.ts }
     end: (?<=\})
@@ -147,7 +147,7 @@ repository:
     begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
     beginCaptures:
       '1': { name: variable.ts }
-      '2': { name: keyword.operator.ts }
+      '2': { name: keyword.others.ts }
     end: '(?=\}|;|,|$)|(?<=\})'
     patterns:
     - include: '#expression'
@@ -160,9 +160,9 @@ repository:
       '2': { name: storage.modifier.ts }
       '3': { name: storage.modifier.ts }
       '4': { name: storage.type.property.ts }
-      '5': { name: keyword.operator.ts }
+      '5': { name: keyword.others.ts }
       '6': { name: entity.name.function.ts }
-      '7': { name: keyword.operator.ts }
+      '7': { name: keyword.others.ts }
     end: '(?=\}|;|,)|(?<=\})'
     patterns:
     - include: '#comment'
@@ -180,9 +180,9 @@ repository:
       '2': { name: storage.modifier.ts }
       '3': { name: storage.modifier.ts }
       '4': { name: storage.type.property.ts }
-      '5': { name: keyword.operator.ts }
+      '5': { name: keyword.others.ts }
       '6': { name: entity.name.function.ts }
-      '7': { name: keyword.operator.ts }
+      '7': { name: keyword.others.ts }
 
   indexer-declaration:
     name: meta.indexer.declaration.ts
@@ -192,7 +192,7 @@ repository:
     end: (\])\s*(\?\s*)?|$
     endCaptures:
       '1': { name: meta.brace.square.ts }
-      '2': { name: keyword.operator.ts }
+      '2': { name: keyword.others.ts }
     patterns:
     - include: '#type-annotation'
     - include: '#indexer-parameter'
@@ -208,7 +208,7 @@ repository:
     name: meta.function.ts
     begin: \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
     beginCaptures:
-      '1': { name: storage.modifier.ts }
+      '1': { name: storage.type.ts }
       '2': { name: storage.modifier.ts }
       '3': { name: storage.type.function.ts }
       '4': { name: entity.name.function.ts }
@@ -225,7 +225,7 @@ repository:
     name: meta.function.overload.ts
     match: \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
     captures:
-      '1': { name: storage.modifier.ts }
+      '1': { name: storage.type.ts }
       '2': { name: storage.type.function.ts }
       '3': { name: entity.name.function.ts }
 
@@ -257,9 +257,9 @@ repository:
     match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)'
     captures:
       '1': { name: storage.modifier.ts }
-      '2': { name: keyword.operator.ts }
+      '2': { name: keyword.others.ts }
       '3': { name: variable.parameter.ts }
-      '4': { name: keyword.operator.ts }
+      '4': { name: keyword.others.ts }
 
   return-type:
     name: meta.return.type.ts
@@ -273,6 +273,7 @@ repository:
     begin: ":"
     end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{)
     patterns:
+    - include: '#expression-operator'
     - include: '#type'
     - include: '#string'
     - include: '#comment'
@@ -336,7 +337,7 @@ repository:
     name: meta.type.function.return.ts
     begin: '=>'
     beginCaptures:
-      '0': { name: keyword.operator.ts }
+      '0': { name: keyword.others.ts }
     end: (?=\s*[,\)\{=;>]|//|$)
     patterns:
     - include: '#type'
@@ -377,7 +378,7 @@ repository:
   variable-initializer:
     begin: (=)
     beginCaptures:
-      '1': { name: keyword.operator.ts }
+      '1': { name: keyword.others.ts }
     end: (?=$|[,);=])
     patterns:
       - include: '#expression'
@@ -398,6 +399,7 @@ repository:
     - include: '#new-expr'
     - include: '#switch-statement'
     - include: '#block'
+    - include: '#import-operator'
     - include: '#expression-operator'
     - include: '#relational-operator'
     - include: '#arithmetic-operator'
@@ -412,7 +414,7 @@ repository:
     name: switch-expression.expr.ts
     begin: \b(switch)\b\s*\(
     beginCaptures:
-      '1': { name: keyword.operator.ts }
+      '1': { name: keyword.control.ts }
     end: \)
     patterns:
     - include: '#expression'
@@ -446,7 +448,7 @@ repository:
     match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b
     captures:
       '1': { name: storage.type.ts }
-      '3': { name: keyword.operator.ts }
+      '3': { name: keyword.others.ts }
 
   function-call:
     name: functioncall.expr.ts
@@ -474,7 +476,7 @@ repository:
     name: new.expr.ts
     begin: '\b(new)\b'
     beginCaptures:
-      '1': { name: keyword.operator.ts }
+      '1': { name: keyword.others.ts }
     # new-expr ends just before any type or call arguments. Type arguments will be picked up by #cast.
     end: '(?=[(;]|$)'
     patterns:
@@ -489,8 +491,12 @@ repository:
     - include: '#expression'
 
   expression-operator:
-    name: keyword.operator.ts
-    match: =>|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b
+    name: keyword.others.ts
+    match: =>|\b(delete|in|instanceof|new|typeof|as|is|of)\b
+
+  import-operator:
+    name: keyword.control.import.include.ts
+    match: \b(import|from)\b
 
   arithmetic-operator:
     name: keyword.operator.arithmetic.ts
@@ -510,7 +516,7 @@ repository:
 
   storage-keyword:
     name: storage.type.ts
-    match: \b(number|boolean|string|any|var|let|function|const|module|namespace)\b
+    match: \b(number|boolean|string|any|var|let|function|const|module|namespace|void|export)\b
 
   paren-expression:
     begin: \(
@@ -579,10 +585,10 @@ repository:
     name: template.element.ts
     begin: \$\{
     beginCaptures:
-      '0': {name: keyword.operator.ts}
+      '0': {name: keyword.others.ts}
     end: \}
     endCaptures:
-      '0': {name: keyword.operator.ts}
+      '0': {name: keyword.others.ts}
     patterns:
       - include: '#expression'