Add the expression scope to the keyword.operator to be colored as key…

…word

TypeScript.YAML-tmLanguage

@@ -698,7 +698,7 @@ repository:
     - include: '#type'
 
   type-predicate-operator:
-    name: keyword.operator.is.ts
+    name: keyword.operator.expression.is.ts
     match: (?<!\.|\$)\bis\b(?!\$)
 
   type-annotation:
@@ -1351,18 +1351,18 @@ repository:
     patterns:
     - name: keyword.control.flow.ts
       match: (?<!\.|\$)\b(await)\b(?!\$)
-    - name: keyword.operator.delete.ts
+    - name: keyword.operator.expression.delete.ts
       match: (?<!\.|\$)\bdelete\b(?!\$)
-    - name: keyword.operator.in.ts
+    - name: keyword.operator.expression.in.ts
       match: (?<!\.|\$)\bin\b(?!\$)
-    - name: keyword.operator.of.ts
+    - name: keyword.operator.expression.of.ts
       match: (?<!\.|\$)\bof\b(?!\$)
-    - name: keyword.operator.instanceof.ts
+    - name: keyword.operator.expression.instanceof.ts
       match: (?<!\.|\$)\binstanceof\b(?!\$)
     - name: keyword.operator.new.ts
       match: (?<!\.|\$)\bnew\b(?!\$)
     - include: '#typeof-operator'
-    - name: keyword.operator.void.ts
+    - name: keyword.operator.expression.void.ts
       match: (?<!\.|\$)\bvoid\b(?!\$)
     - begin: (?<!\.|\$)\bas\b(?!\$)
       beginCaptures:
@@ -1396,7 +1396,7 @@ repository:
       match: '%|\*|/|-|\+'
 
   typeof-operator:
-    name: keyword.operator.typeof.ts
+    name: keyword.operator.expression.typeof.ts
     match: (?<!\.|\$)\btypeof\b(?!\$)
 
   arrow-function:

TypeScript.YAML-tmTheme

@@ -5,9 +5,7 @@ name: TypeScript
 uuid: ef98eb90-bf9b-11e4-bb52-0800200c9a66
 
 settings:
-- scope: storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.generator.asterisk, punctuation.definition.template-expression
-  settings: { vsclassificationtype: keyword }
-- scope: keyword.operator.new.ts, keyword.operator.delete.ts, keyword.operator.in.ts, keyword.operator.of.ts, keyword.operator.instanceof.ts, keyword.operator.typeof.ts, keyword.operator.void.ts, keyword.control.as.ts, keyword.operator.is.ts
+- scope: storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression
   settings: { vsclassificationtype: keyword }
 - scope: support.type, constant.language, variable.language
   settings: { vsclassificationtype: keyword }

TypeScript.tmLanguage

@@ -2289,7 +2289,7 @@
       <key>type-predicate-operator</key>
       <dict>
         <key>name</key>
-        <string>keyword.operator.is.ts</string>
+        <string>keyword.operator.expression.is.ts</string>
         <key>match</key>
         <string>(?&lt;!\.|\$)\bis\b(?!\$)</string>
       </dict>
@@ -3793,25 +3793,25 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.delete.ts</string>
+            <string>keyword.operator.expression.delete.ts</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bdelete\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.in.ts</string>
+            <string>keyword.operator.expression.in.ts</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bin\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.of.ts</string>
+            <string>keyword.operator.expression.of.ts</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bof\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.instanceof.ts</string>
+            <string>keyword.operator.expression.instanceof.ts</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\binstanceof\b(?!\$)</string>
           </dict>
@@ -3827,7 +3827,7 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.void.ts</string>
+            <string>keyword.operator.expression.void.ts</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bvoid\b(?!\$)</string>
           </dict>
@@ -3929,7 +3929,7 @@
       <key>typeof-operator</key>
       <dict>
         <key>name</key>
-        <string>keyword.operator.typeof.ts</string>
+        <string>keyword.operator.expression.typeof.ts</string>
         <key>match</key>
         <string>(?&lt;!\.|\$)\btypeof\b(?!\$)</string>
       </dict>

TypeScript.tmTheme

@@ -10,16 +10,7 @@
     <array>
       <dict>
         <key>scope</key>
-        <string>storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.generator.asterisk, punctuation.definition.template-expression</string>
-        <key>settings</key>
-        <dict>
-          <key>vsclassificationtype</key>
-          <string>keyword</string>
-        </dict>
-      </dict>
-      <dict>
-        <key>scope</key>
-        <string>keyword.operator.new.ts, keyword.operator.delete.ts, keyword.operator.in.ts, keyword.operator.of.ts, keyword.operator.instanceof.ts, keyword.operator.typeof.ts, keyword.operator.void.ts, keyword.control.as.ts, keyword.operator.is.ts</string>
+        <string>storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>

TypeScriptReact.tmLanguage

@@ -2293,7 +2293,7 @@
       <key>type-predicate-operator</key>
       <dict>
         <key>name</key>
-        <string>keyword.operator.is.tsx</string>
+        <string>keyword.operator.expression.is.tsx</string>
         <key>match</key>
         <string>(?&lt;!\.|\$)\bis\b(?!\$)</string>
       </dict>
@@ -3775,25 +3775,25 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.delete.tsx</string>
+            <string>keyword.operator.expression.delete.tsx</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bdelete\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.in.tsx</string>
+            <string>keyword.operator.expression.in.tsx</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bin\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.of.tsx</string>
+            <string>keyword.operator.expression.of.tsx</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bof\b(?!\$)</string>
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.instanceof.tsx</string>
+            <string>keyword.operator.expression.instanceof.tsx</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\binstanceof\b(?!\$)</string>
           </dict>
@@ -3809,7 +3809,7 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>keyword.operator.void.tsx</string>
+            <string>keyword.operator.expression.void.tsx</string>
             <key>match</key>
             <string>(?&lt;!\.|\$)\bvoid\b(?!\$)</string>
           </dict>
@@ -3911,7 +3911,7 @@
       <key>typeof-operator</key>
       <dict>
         <key>name</key>
-        <string>keyword.operator.typeof.tsx</string>
+        <string>keyword.operator.expression.typeof.tsx</string>
         <key>match</key>
         <string>(?&lt;!\.|\$)\btypeof\b(?!\$)</string>
       </dict>

TypeScriptReact.tmTheme

@@ -10,16 +10,7 @@
     <array>
       <dict>
         <key>scope</key>
-        <string>storage.modifier, storage.type, keyword.control, keyword.other.tsx, keyword.generator.asterisk, punctuation.definition.template-expression</string>
-        <key>settings</key>
-        <dict>
-          <key>vsclassificationtype</key>
-          <string>keyword</string>
-        </dict>
-      </dict>
-      <dict>
-        <key>scope</key>
-        <string>keyword.operator.new.tsx, keyword.operator.delete.tsx, keyword.operator.in.tsx, keyword.operator.of.tsx, keyword.operator.instanceof.tsx, keyword.operator.typeof.tsx, keyword.operator.void.tsx, keyword.control.as.tsx, keyword.operator.is.tsx</string>
+        <string>storage.modifier, storage.type, keyword.control, keyword.other.tsx, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression</string>
         <key>settings</key>
         <dict>
           <key>vsclassificationtype</key>

tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

@@ -280,7 +280,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.function.ts meta.block.ts meta.brace.round.ts
          ^^^^^^
-         source.ts meta.function.ts meta.block.ts keyword.operator.typeof.ts
+         source.ts meta.function.ts meta.block.ts keyword.operator.expression.typeof.ts
                ^
                source.ts meta.function.ts meta.block.ts
                 ^

tests/baselines/Issue180.baseline.txt

@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
     ^
     source.ts meta.brace.round.ts
      ^^^^^^
-     source.ts keyword.operator.typeof.ts
+     source.ts keyword.operator.expression.typeof.ts
            ^
            source.ts
             ^^^^^^^^^

tests/baselines/Issue232.baseline.txt

@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts
                          ^^
-                         source.ts keyword.operator.of.ts
+                         source.ts keyword.operator.expression.of.ts
                            ^
                            source.ts
                             ^^^^

tests/baselines/Issue243.baseline.txt

@@ -194,7 +194,7 @@ Grammar: TypeScript.tmLanguage
                    ^
                    source.ts
                     ^^
-                    source.ts keyword.operator.in.ts
+                    source.ts keyword.operator.expression.in.ts
                       ^
                       source.ts
                        ^^^^^^

tests/baselines/Issue37.baseline.txt

@@ -254,7 +254,7 @@ Grammar: TypeScript.tmLanguage
  source.ts
 >void newFunctionName(){
  ^^^^
- source.ts keyword.operator.void.ts
+ source.ts keyword.operator.expression.void.ts
      ^
      source.ts
       ^^^^^^^^^^^^^^^
@@ -466,7 +466,7 @@ Grammar: TypeScript.tmLanguage
        ^
        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
         ^^^^^^
-        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.typeof.ts
+        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.expression.typeof.ts
               ^
               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
                ^
@@ -519,7 +519,7 @@ Grammar: TypeScript.tmLanguage
                             source.ts punctuation.terminator.statement.ts
 >delete (adder)
  ^^^^^^
- source.ts keyword.operator.delete.ts
+ source.ts keyword.operator.expression.delete.ts
        ^
        source.ts
         ^
@@ -545,7 +545,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.var.expr.ts
          ^^^^^^
-         source.ts meta.var.expr.ts keyword.operator.typeof.ts
+         source.ts meta.var.expr.ts keyword.operator.expression.typeof.ts
                ^
                source.ts meta.var.expr.ts
                 ^
@@ -696,7 +696,7 @@ Grammar: TypeScript.tmLanguage
                 ^
                 source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                  ^^^^^^
-                 source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
+                 source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.typeof.ts
                        ^
                        source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                         ^^^^^^
@@ -724,7 +724,7 @@ Grammar: TypeScript.tmLanguage
                                                      ^
                                                      source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                                                       ^^^^^^^^^^
-                                                      source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts
+                                                      source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.instanceof.ts
                                                                 ^
                                                                 source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                                                                  ^^^^^

tests/baselines/Issue37.txt

@@ -120,7 +120,7 @@ Grammar: TypeScript.tmLanguage
 >
 >void newFunctionName(){
  ^^^^
- [19, 1]: source.ts keyword.operator.void.ts 
+ [19, 1]: source.ts keyword.operator.expression.void.ts 
       ^^^^^^^^^^^^^^^
       [19, 6]: source.ts entity.name.function.ts 
 >
@@ -162,14 +162,14 @@ Grammar: TypeScript.tmLanguage
 >
 >var m: typeof M = M;
         ^^^^^^
-        [41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.typeof.ts 
+        [41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.expression.typeof.ts 
 >
 >var adder = new Adder(3, 4);
              ^^^
              [43, 13]: source.ts meta.var.expr.ts new.expr.ts keyword.operator.new.ts 
 >delete (adder)
  ^^^^^^
- [44, 1]: source.ts keyword.operator.delete.ts 
+ [44, 1]: source.ts keyword.operator.expression.delete.ts 
 >
 >var s = typeof {}git 
 >interface I {}
@@ -210,7 +210,7 @@ Grammar: TypeScript.tmLanguage
                            [56, 27]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
 >            if (typeof parent === 'object' || parent instanceof Error) {
                  ^^^^^^
-                 [57, 17]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts 
+                 [57, 17]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.typeof.ts 
                         ^^^^^^
                         [57, 24]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
                                ^^^
@@ -220,7 +220,7 @@ Grammar: TypeScript.tmLanguage
                                                ^^^^^^
                                                [57, 47]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.readwrite.ts 
                                                       ^^^^^^^^^^
-                                                      [57, 54]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts 
+                                                      [57, 54]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.instanceof.ts 
                                                                  ^^^^^
                                                                  [57, 65]: source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.error.ts 
 >            	

tests/baselines/javascript.baseline.txt

@@ -58,7 +58,7 @@ Grammar: TypeScript.tmLanguage
   source.ts
 >typeof x;
  ^^^^^^
- source.ts keyword.operator.typeof.ts
+ source.ts keyword.operator.expression.typeof.ts
        ^
        source.ts
         ^
@@ -69,7 +69,7 @@ Grammar: TypeScript.tmLanguage
           source.ts
 >void x;
  ^^^^
- source.ts keyword.operator.void.ts
+ source.ts keyword.operator.expression.void.ts
      ^
      source.ts
       ^
@@ -80,7 +80,7 @@ Grammar: TypeScript.tmLanguage
         source.ts
 >delete x.y;
  ^^^^^^
- source.ts keyword.operator.delete.ts
+ source.ts keyword.operator.expression.delete.ts
        ^
        source.ts
         ^
@@ -99,7 +99,7 @@ Grammar: TypeScript.tmLanguage
   ^
   source.ts
    ^^^^^^^^^^
-   source.ts keyword.operator.instanceof.ts
+   source.ts keyword.operator.expression.instanceof.ts
              ^
              source.ts
               ^

tests/baselines/javascript.txt

@@ -24,13 +24,13 @@ Grammar: TypeScript.tmLanguage
 >}
 >typeof x;
  ^^^^^^
- [5, 1]: source.ts keyword.operator.typeof.ts 
+ [5, 1]: source.ts keyword.operator.expression.typeof.ts 
 >void x;
  ^^^^
- [6, 1]: source.ts keyword.operator.void.ts 
+ [6, 1]: source.ts keyword.operator.expression.void.ts 
 >delete x.y;
  ^^^^^^
- [7, 1]: source.ts keyword.operator.delete.ts 
+ [7, 1]: source.ts keyword.operator.expression.delete.ts 
 >x instanceof y;
    ^^^^^^^^^^
-   [8, 3]: source.ts keyword.operator.instanceof.ts 
+   [8, 3]: source.ts keyword.operator.expression.instanceof.ts