fixes for issues 89 and 63

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:
@@ -89,9 +92,7 @@ repository:
     begin: '(?:\b(extends|implements))'
     beginCaptures:
       '1': { name: keyword.other.ts }
-    end: (?=\{)
-    endCaptures:
-      '1': { name: brace.curly.ts }
+    end: \b
     patterns:
     - include: '#comment'
     - include: '#object-heritage'

TypeScript.tmLanguage

@@ -1008,15 +1008,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=\{)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>brace.curly.ts</string>
-				</dict>
-			</dict>
+			<string>\b</string>
 			<key>name</key>
 			<string>meta.object.heritage.ts</string>
 			<key>patterns</key>
@@ -1486,7 +1478,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 +1498,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>