Merge pull request #215 from zhengbli/fixSyntaxIssues

Fix highlighting issues for constructors containing type parameter

Author: zhengbli

TypeScript.YAML-tmLanguage

@@ -133,14 +133,23 @@ repository:
       '2': { name: keyword.operator.ts }
       '3': { name: entity.name.function.ts }
       '4': { name: keyword.operator.ts }
-    end: '(?=\}|;|,|\n)|(?<=\})'
+    end: '(?=\}|;|,)|(?<=\})'
     patterns:
     - include: '#comment'
     - include: '#type-parameters'
     - include: '#function-type-parameters'
     - include: '#type-annotation'
+    - include: '#method-overload-declaration'
     - include: '#decl-block'
 
+  method-overload-declaration:
+    name: meta.method.overload.declaration.ts
+    match: '(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
+    captures:
+      '1': { name: keyword.operator.ts }
+      '2': { name: entity.name.function.ts }
+      '3': { name: keyword.operator.ts }
+
   indexer-declaration:
     name: meta.indexer.declaration.ts
     begin: \[
@@ -309,9 +318,10 @@ repository:
 
   type-parameters:
     name: meta.type.parameters.ts
-    begin: '<'
+    begin: '([a-zA-Z_$][\w$]*)?(<)'
     beginCaptures:
-      '0': { name: meta.brace.angle.ts }
+      '1': { name: entity.name.type.ts }
+      '2': { name: meta.brace.angle.ts }
     end: '(?=$)|(>)'  
     endCaptures:
       '2': { name: meta.brace.angle.ts }
@@ -343,6 +353,7 @@ repository:
     - include: '#declaration'
     - include: '#cast'
     - include: '#new-expr'
+    - include: '#function-call'
     - include: '#block'
     - include: '#expression-operator'
     - include: '#relational-operator'
@@ -359,7 +370,13 @@ repository:
     captures:
       '1': { name: storage.type.ts }
       '3': { name: keyword.operator.ts }
-      
+
+  function-call:
+    name: functioncall.expr.ts
+    patterns:
+    - include: '#type-parameters'
+    - include: '#paren-expression'
+
   cast:
     name: cast.expr.ts
     # To differentiate a cast vs a relational <, this regexp tries to use the surrounding context
@@ -368,10 +385,10 @@ repository:
     # '<=' and '<<=' are definately not type assertions, as they are assignment operators.
     begin: '(?:(?<=return|throw|yield|[=(,:>]))\s*(<)(?!<?\=)'
     beginCaptures:
-      '1': { name: keyword.operator.type.ts }
+      '1': { name: meta.brace.angle.ts }
     end: '>'
     endCaptures:
-      '0': { name: keyword.operator.type.ts }
+      '0': { name: meta.brace.angle.ts }
     patterns:
     - include: '#type'
 
@@ -381,7 +398,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.operator.ts }
     # new-expr ends just before any type or call arguments. Type arguments will be picked up by #cast.
-    end: '(?=[<(;]|$)'
+    end: '(?=[(;]|$)'
     patterns:
     - include: '#type'
 

TypeScript.tmLanguage

@@ -122,7 +122,7 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.type.ts</string>
+					<string>meta.brace.angle.ts</string>
 				</dict>
 			</dict>
 			<key>end</key>
@@ -132,7 +132,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.type.ts</string>
+					<string>meta.brace.angle.ts</string>
 				</dict>
 			</dict>
 			<key>name</key>
@@ -328,6 +328,10 @@
 					<key>include</key>
 					<string>#new-expr</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#function-call</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#block</string>
@@ -422,6 +426,22 @@
 			<key>name</key>
 			<string>forin.expr.ts</string>
 		</dict>
+		<key>function-call</key>
+		<dict>
+			<key>name</key>
+			<string>functioncall.expr.ts</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#paren-expression</string>
+				</dict>
+			</array>
+		</dict>
 		<key>function-declaration</key>
 		<dict>
 			<key>begin</key>
@@ -662,7 +682,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=\}|;|,|\n)|(?&lt;=\})</string>
+			<string>(?=\}|;|,)|(?&lt;=\})</string>
 			<key>name</key>
 			<string>meta.method.declaration.ts</string>
 			<key>patterns</key>
@@ -683,12 +703,41 @@
 					<key>include</key>
 					<string>#type-annotation</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#method-overload-declaration</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#decl-block</string>
 				</dict>
 			</array>
 		</dict>
+		<key>method-overload-declaration</key>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.ts</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.ts</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.ts</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
+			<key>name</key>
+			<string>meta.method.overload.declaration.ts</string>
+		</dict>
 		<key>new-expr</key>
 		<dict>
 			<key>begin</key>
@@ -702,7 +751,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[&lt;(;]|$)</string>
+			<string>(?=[(;]|$)</string>
 			<key>name</key>
 			<string>new.expr.ts</string>
 			<key>patterns</key>
@@ -1361,10 +1410,15 @@
 		<key>type-parameters</key>
 		<dict>
 			<key>begin</key>
-			<string>&lt;</string>
+			<string>([a-zA-Z_$][\w$]*)?(&lt;)</string>
 			<key>beginCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.type.ts</string>
+				</dict>
+				<key>2</key>
 				<dict>
 					<key>name</key>
 					<string>meta.brace.angle.ts</string>