Fix typeof as typeof expression in type arguments

Fixes #846

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1739,7 +1739,7 @@ repository:
     begin: '{{startOfIdentifier}}typeof{{endOfIdentifier}}'
     beginCaptures:
       '0': { name: keyword.operator.expression.typeof.ts }
-    end: (?=[,);}\]=]|$|{{endOfStatement}})
+    end: (?=[,);}\]=>]|$|{{endOfStatement}})
     patterns:
     - include: '#expression'
 

TypeScript.tmLanguage

@@ -5641,7 +5641,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=[,);}\]=]|$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
+        <string>(?=[,);}\]=&gt;]|$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
         <key>patterns</key>
         <array>
           <dict>

TypeScriptReact.tmLanguage

@@ -5587,7 +5587,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=[,);}\]=]|$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
+        <string>(?=[,);}\]=&gt;]|$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
         <key>patterns</key>
         <array>
           <dict>

tests/baselines/Issue846.baseline.txt

@@ -0,0 +1,82 @@
+original file
+-----------------------------------
+function foo(): number { return 42; }
+let bar: ReturnType<typeof foo>;
+bar = 1;
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>function foo(): number { return 42; }
+ ^^^^^^^^
+ 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 meta.return.type.ts keyword.operator.type.annotation.ts
+                ^
+                source.ts meta.function.ts meta.return.type.ts
+                 ^^^^^^
+                 source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
+                       ^
+                       source.ts meta.function.ts meta.return.type.ts
+                        ^
+                        source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
+                         ^
+                         source.ts meta.function.ts meta.block.ts
+                          ^^^^^^
+                          source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
+                                ^
+                                source.ts meta.function.ts meta.block.ts
+                                 ^^
+                                 source.ts meta.function.ts meta.block.ts constant.numeric.decimal.ts
+                                   ^
+                                   source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
+                                    ^
+                                    source.ts meta.function.ts meta.block.ts
+                                     ^
+                                     source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
+>let bar: ReturnType<typeof foo>;
+ ^^^
+ source.ts meta.var.expr.ts storage.type.ts
+    ^
+    source.ts meta.var.expr.ts
+     ^^^
+     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+        ^
+        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+         ^
+         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 entity.name.type.ts
+                    ^
+                    source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
+                     ^^^^^^
+                     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.parameters.ts keyword.operator.expression.typeof.ts
+                           ^
+                           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.parameters.ts
+                            ^^^
+                            source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.parameters.ts variable.other.readwrite.ts
+                               ^
+                               source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
+                                ^
+                                source.ts punctuation.terminator.statement.ts
+>bar = 1;
+ ^^^
+ source.ts variable.other.readwrite.ts
+    ^
+    source.ts
+     ^
+     source.ts keyword.operator.assignment.ts
+      ^
+      source.ts
+       ^
+       source.ts constant.numeric.decimal.ts
+        ^
+        source.ts punctuation.terminator.statement.ts

tests/cases/Issue846.ts

@@ -0,0 +1,3 @@
+function foo(): number { return 42; }
+let bar: ReturnType<typeof foo>;
+bar = 1;