Fixing issues with type parameters.

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -49,7 +49,7 @@ 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'
       - name: keyword.operator.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>

TypeScriptReact.YAML-tmLanguage

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

TypeScriptReact.tmLanguage

@@ -1858,18 +1858,18 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.other.ts</string>
+					<string>keyword.other.tsx</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.ts</string>
+					<string>storage.type.tsx</string>
 				</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>
+			<string>meta.type.declaration.tsx</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -1880,7 +1880,7 @@
 					<key>match</key>
 					<string>=\s*</string>
 					<key>name</key>
-					<string>keyword.operator.ts</string>
+					<string>keyword.operator.tsx</string>
 				</dict>
 				<dict>
 					<key>include</key>

tests/cases/Issue63.ts

@@ -0,0 +1,16 @@
+^type ^Callback <^string> = ^(error: Error, value: T)
+
+^f1 = ^foo ^< ^bar(a, b)>; // bar is an expression (function call)
+
+^f2 = ^foo<bar>(a, b){ // bar is a generic function definition
+}
+
+^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