New changes commited: Changed test63.ts and added suggested changes

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -49,12 +49,12 @@ repository:
     beginCaptures:
       '1': { name: keyword.other.ts }
       '2': { name: storage.type.ts }
-    end: (?=[,);>]|var|type|function|class|interface)
+    end: (?=$|[,);>]|var|type|function|class|interface)
     patterns:
       - include: '#type-parameters'
+      - include: '#type'
       - name: keyword.operator.ts
         match: '=\s*'
-      - include: '#type'
 
   enum-declaration:
     name: meta.enum.declaration.ts

TypeScript.tmLanguage

@@ -1501,7 +1501,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
+			<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
 			<key>name</key>
 			<string>meta.type.declaration.ts</string>
 			<key>patterns</key>
@@ -1510,16 +1510,16 @@
 					<key>include</key>
 					<string>#type-parameters</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#type</string>
+				</dict>
 				<dict>
 					<key>match</key>
 					<string>=\s*</string>
 					<key>name</key>
 					<string>keyword.operator.ts</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#type</string>
-				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>

TypeScriptReact.YAML-tmLanguage

@@ -51,12 +51,12 @@ repository:
     beginCaptures:
       '1': { name: keyword.other.tsx }
       '2': { name: storage.type.tsx }
-    end: (?=[,);>]|var|type|function|class|interface)
+    end: (?=$|[,);>]|var|type|function|class|interface)
     patterns:
       - include: '#type-parameters'
+      - include: '#type'
       - name: keyword.operator.tsx
         match: '=\s*'
-      - include: '#type'
 
   enum-declaration:
     name: meta.enum.declaration.tsx

TypeScriptReact.tmLanguage

@@ -1867,7 +1867,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
+			<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
 			<key>name</key>
 			<string>meta.type.declaration.tsx</string>
 			<key>patterns</key>
@@ -1876,16 +1876,16 @@
 					<key>include</key>
 					<string>#type-parameters</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#type</string>
+				</dict>
 				<dict>
 					<key>match</key>
 					<string>=\s*</string>
 					<key>name</key>
 					<string>keyword.operator.tsx</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#type</string>
-				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>

tests/cases/Issue63.ts

@@ -1,16 +1,7 @@
-^type ^Callback <^string> = ^(error: Error, value: T)
+^type ^Callback <^string> = ^(error: Error, value: T) => any
 
-^f1 = ^foo ^< ^bar(a, b)>; // bar is an expression (function call)
+^type Callback^<string > = ^(error: Error, value: T) ^=> ^any
 
-^f2 = ^foo<bar>(a, b){ // bar is a generic function definition
-}
+type Callback = ^(error: Error, value: T) => ^any
 
-^f3 = ^foo^<^bar extends ^{ ^a: () ^=> ^string }>^(a, b){ // as above, but has an object literal type constraint
-}
-
-/*^ */
-
-^
-^f4 = ^foo ^< ^bar(a, b) ^> ^baz(5); // similar to f1, but with a > operator also
-
-^f5 = ^foo < ^(function(x) { ^return x; } )(5); // IIFE as RHS of expression
+^type ^Callback^<string ^| ^(a: number, b: string) => ^void> = ^(error: Error, value: T) => ^any