Syntax highlighting issue when there is no space preceding (TypeScript-TmLanguage/issues/11)

extensions/typescript/syntaxes/TypeScript.tmLanguage

@@ -1659,7 +1659,7 @@
 		<key>type-parameters</key>
 		<dict>
 			<key>begin</key>
-			<string>([a-zA-Z_$][\w$]*)?(&lt;)</string>
+			<string>([a-zA-Z_$][\w$]*)?(&lt;)(?=(([a-zA-Z_$][\w$.]*)(&lt;([a-zA-Z_$][\w$.,\s]+)&gt;)?[,\s]*)+&gt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

extensions/typescript/syntaxes/TypeScriptReact.tmLanguage

@@ -2025,7 +2025,7 @@
 		<key>type-parameters</key>
 		<dict>
 			<key>begin</key>
-			<string>([a-zA-Z_$][\w$]*)?(&lt;)</string>
+			<string>([a-zA-Z_$][\w$]*)?(&lt;)(?=(([a-zA-Z_$][\w$.]*)(&lt;([a-zA-Z_$][\w$.,\s]+)&gt;)?[,\s]*)+&gt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

extensions/typescript/test/colorize-fixtures/test-issue6916.ts

+for(var i=0;i<9;i++){for(var j;i>j;j++){if(j+i<3)console.log(i>j);}}
+let x: Thenable<void> = new Promise<A<E, e.F>>();
\ No newline at end of file

extensions/typescript/test/colorize-fixtures/test-issue6916.tsx

+for(var i=0;i<9;i++){for(var j;i>j;j++){if(j+i<3)console.log(i>j);}}
+let x: Thenable<void> = new Promise<A<E, e.F>>();
\ No newline at end of file