Fixing Issue 63 - Attempt 1

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -45,12 +45,15 @@ repository:
 
   type-declaration:
     name: meta.type.declaration.ts
-    begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*
+    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)
     patterns:
+      - include: '#type-parameters'
+      - name: keyword.operator.ts
+        match: '=\s*'
       - include: '#type'
 
   enum-declaration:

TypeScript.tmLanguage

@@ -1486,7 +1486,7 @@
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
+			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1506,6 +1506,16 @@
 			<string>meta.type.declaration.ts</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</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>

TypeScriptReact.YAML-tmLanguage

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

TypeScriptReact.tmLanguage

@@ -1852,26 +1852,36 @@
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
+			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.other.tsx</string>
+					<string>keyword.other.ts</string>
 				</dict>
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.tsx</string>
+					<string>storage.type.ts</string>
 				</dict>
 			</dict>
 			<key>end</key>
 			<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
 			<key>name</key>
-			<string>meta.type.declaration.tsx</string>
+			<string>meta.type.declaration.ts</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</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>