Fixing Issues #63 and #90

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -49,13 +49,13 @@ 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
         match: '=\s*'
       - include: '#type'
-
+      
   enum-declaration:
     name: meta.enum.declaration.ts
     match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*)
@@ -92,7 +92,9 @@ repository:
     begin: '(?:\b(extends|implements))'
     beginCaptures:
       '1': { name: keyword.other.ts }
-    end: \b
+    end: (?=\{)
+    endCaptures:
+      '1': { name: brace.curly.ts }
     patterns:
     - include: '#comment'
     - include: '#object-heritage'
@@ -504,7 +506,7 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.ts
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.ts

TypeScript.tmLanguage

@@ -704,7 +704,7 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.ts</string>
 		</dict>
@@ -1008,7 +1008,15 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>\b</string>
+			<string>(?=\{)</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>brace.curly.ts</string>
+				</dict>
+			</dict>
 			<key>name</key>
 			<string>meta.object.heritage.ts</string>
 			<key>patterns</key>
@@ -1493,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,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 }
-    end: (?=$|[,);>]|var|type|function|class|interface)
+      '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:
@@ -491,7 +494,7 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.tsx
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.tsx

TypeScriptReact.tmLanguage

@@ -1070,7 +1070,7 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.tsx</string>
 		</dict>
@@ -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>
+			<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>