Align the specification of typeof operator within expression operators

TypeScript.YAML-tmLanguage

@@ -1744,7 +1744,8 @@ repository:
       match: '{{startOfIdentifier}}instanceof{{endOfIdentifier}}'
     - name: keyword.operator.new.ts
       match: '{{startOfIdentifier}}new{{endOfIdentifier}}'
-    - include: '#typeof-operator'
+    - name: keyword.operator.typeof.ts
+      match: '{{startOfIdentifier}}typeof{{endOfIdentifier}}'
     - name: keyword.operator.expression.void.ts
       match: '{{startOfIdentifier}}void{{endOfIdentifier}}'
       #handle as operator specifically to be recognized only if it is 'as' followed by space

TypeScript.tmLanguage

@@ -5670,8 +5670,10 @@
             <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
           <dict>
-            <key>include</key>
-            <string>#typeof-operator</string>
+            <key>name</key>
+            <string>keyword.operator.typeof.ts</string>
+            <key>match</key>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
           <dict>
             <key>name</key>

TypeScriptReact.tmLanguage

@@ -5616,8 +5616,10 @@
             <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
           <dict>
-            <key>include</key>
-            <string>#typeof-operator</string>
+            <key>name</key>
+            <string>keyword.operator.typeof.tsx</string>
+            <key>match</key>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
           </dict>
           <dict>
             <key>name</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.expression.typeof.ts
+         source.ts meta.function.ts meta.block.ts keyword.operator.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.expression.typeof.ts
+     source.ts keyword.operator.typeof.ts
            ^
            source.ts
             ^^^^^^^^^

tests/baselines/Issue37.baseline.txt

@@ -545,7 +545,7 @@ Grammar: TypeScript.tmLanguage
         ^
         source.ts meta.var.expr.ts
          ^^^^^^
-         source.ts meta.var.expr.ts keyword.operator.expression.typeof.ts
+         source.ts meta.var.expr.ts keyword.operator.typeof.ts
                ^
                source.ts meta.var.expr.ts
                 ^
@@ -696,7 +696,7 @@ Grammar: TypeScript.tmLanguage
                 ^
                 source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                  ^^^^^^
-                 source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.typeof.ts
+                 source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
                        ^
                        source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                         ^^^^^^

tests/baselines/Issue403IncorrectlyDetectedArrowTypeParameters.baseline.txt

@@ -230,7 +230,7 @@ Grammar: TypeScript.tmLanguage
                         ^
                         source.ts meta.objectliteral.ts meta.object.member.ts meta.function.expression.ts meta.block.ts meta.var.expr.ts
                          ^^^^^^
-                         source.ts meta.objectliteral.ts meta.object.member.ts meta.function.expression.ts meta.block.ts meta.var.expr.ts keyword.operator.expression.typeof.ts
+                         source.ts meta.objectliteral.ts meta.object.member.ts meta.function.expression.ts meta.block.ts meta.var.expr.ts keyword.operator.typeof.ts
                                ^
                                source.ts meta.objectliteral.ts meta.object.member.ts meta.function.expression.ts meta.block.ts meta.var.expr.ts
                                 ^

tests/baselines/Issue554.baseline.txt

@@ -109,7 +109,7 @@ Grammar: TypeScript.tmLanguage
  ^^^
  source.ts keyword.operator.spread.ts
     ^^^^^^
-    source.ts keyword.operator.expression.typeof.ts
+    source.ts keyword.operator.typeof.ts
           ^
           source.ts
            ^

tests/baselines/Issue858.baseline.txt

@@ -154,7 +154,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                      ^^^^^^
-                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.typeof.ts
+                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                             ^^^^^^^^^^^^

tests/baselines/Issue978.baseline.txt

@@ -0,0 +1,48 @@
+original file
+-----------------------------------
+typeof x < ''; function f() {}
+
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>typeof x < ''; function f() {}
+ ^^^^^^
+ source.ts keyword.operator.typeof.ts
+       ^
+       source.ts
+        ^
+        source.ts variable.other.readwrite.ts
+         ^
+         source.ts
+          ^
+          source.ts keyword.operator.relational.ts
+           ^
+           source.ts
+            ^
+            source.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+             ^
+             source.ts string.quoted.single.ts punctuation.definition.string.end.ts
+              ^
+              source.ts punctuation.terminator.statement.ts
+               ^
+               source.ts
+                ^^^^^^^^
+                source.ts meta.function.ts storage.type.function.ts
+                        ^
+                        source.ts meta.function.ts
+                         ^
+                         source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
+                          ^
+                          source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+                           ^
+                           source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+                            ^
+                            source.ts meta.function.ts
+                             ^
+                             source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
+                              ^
+                              source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
+>
+ ^
+ source.ts

tests/baselines/assertions.baseline.txt

@@ -831,7 +831,7 @@ Grammar: TypeScript.tmLanguage
                     ^
                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
                      ^^^^^^
-                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.expression.typeof.ts
+                     source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
                            ^
                            source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
                             ^

tests/baselines/javascript.baseline.txt

@@ -50,7 +50,7 @@ Grammar: TypeScript.tmLanguage
  source.ts switch-statement.expr.ts punctuation.definition.block.ts
 >typeof x;
  ^^^^^^
- source.ts keyword.operator.expression.typeof.ts
+ source.ts keyword.operator.typeof.ts
        ^
        source.ts
         ^

tests/cases/Issue978.ts

@@ -0,0 +1 @@
+typeof x < ''; function f() {}