Add generic method decl. Fix termination of type annotation with identifier.

Author: steveluc

TypeScript.YAML-tmLanguage

@@ -124,7 +124,7 @@ repository:
 
   method-declaration:
     name: meta.method.declaration.ts
-    begin: '(?:\b(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\()'
+    begin: '(?:\b(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
     beginCaptures:
       '1': { name: storage.type.property.ts }
       '2': { name: keyword.operator.ts }
@@ -133,6 +133,7 @@ repository:
     end: '(?=\}|;|,)|(?<=\})'
     patterns:
     - include: '#comment'
+    - include: '#type-parameters'
     - include: '#function-parameters'
     - include: '#type-annotation'
     - include: '#decl-block'
@@ -241,7 +242,7 @@ repository:
   type-annotation:
     name: meta.type.annotation.ts
     begin: ":"
-    end: (?=$|[,);\}\[\]]|//)|(?==[^>])|(?<=\}|[a-z]|>)\s*(?=\{)
+    end: (?=$|[,);\}\[\]]|//)|(?==[^>])|(?<=\}|[a-zA-Z_$]|>)\s*(?=\{)
     patterns:
       - include: '#type'
       - include: '#comment'

TypeScript.tmLanguage

@@ -660,7 +660,7 @@
 		<key>method-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\()</string>
+			<string>(?:\b(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -694,6 +694,10 @@
 					<key>include</key>
 					<string>#comment</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#function-parameters</string>
@@ -1279,7 +1283,7 @@
 			<key>begin</key>
 			<string>:</string>
 			<key>end</key>
-			<string>(?=$|[,);\}\[\]]|//)|(?==[^&gt;])|(?&lt;=\}|[a-z]|&gt;)\s*(?=\{)</string>
+			<string>(?=$|[,);\}\[\]]|//)|(?==[^&gt;])|(?&lt;=\}|[a-zA-Z_$]|&gt;)\s*(?=\{)</string>
 			<key>name</key>
 			<string>meta.type.annotation.ts</string>
 			<key>patterns</key>