Merge remote-tracking branch 'origin/master' into branch_anubha

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -45,13 +45,16 @@ 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'
       - include: '#type'
+      - name: keyword.operator.ts
+        match: '=\s*'
 
   enum-declaration:
     name: meta.enum.declaration.ts

TypeScript.tmLanguage

@@ -1486,7 +1486,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,10 +1506,20 @@
 			<string>meta.type.declaration.ts</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>=\s*</string>
+					<key>name</key>
+					<string>keyword.operator.ts</string>
+				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>

TypeScriptReact.YAML-tmLanguage

@@ -47,13 +47,16 @@ repository:
 
   type-declaration:
     name: meta.type.declaration.tsx
-    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.tsx }
       '2': { name: storage.type.tsx }
     end: (?=$|[,);>]|var|type|function|class|interface)
     patterns:
+      - include: '#type-parameters'
       - include: '#type'
+      - name: keyword.operator.tsx
+        match: '=\s*'
 
   enum-declaration:
     name: meta.enum.declaration.tsx

TypeScriptReact.tmLanguage

@@ -1852,7 +1852,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>
@@ -1872,10 +1872,20 @@
 			<string>meta.type.declaration.tsx</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>=\s*</string>
+					<key>name</key>
+					<string>keyword.operator.tsx</string>
+				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>

tests/baselines/Issue63.txt

@@ -0,0 +1,28 @@
+[1, 1]: source.ts meta.type.declaration.ts keyword.other.ts 
+[1, 6]: source.ts meta.type.declaration.ts storage.type.ts 
+[1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts 
+[1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts 
+[3, 1]: source.ts meta.type.declaration.ts keyword.other.ts 
+[3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts 
+[3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts 
+[3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts 
+[3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts 
+[5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts 
+[5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts 
+[7, 1]: source.ts meta.type.declaration.ts keyword.other.ts 
+[7, 6]: source.ts meta.type.declaration.ts storage.type.ts 
+[7, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts 
+[7, 22]: source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts 
+[7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts 
+[7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts 
+[7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts 
+[7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts 
+[9, 1]: source.ts 
+[9, 7]: source.ts meta.type.declaration.ts storage.type.ts 
+[9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts 
+[9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts 
+[11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts 
+[11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts 
+[12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts 
+[12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts storage.type.ts 
+[14, 1]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts 

tests/cases/Issue63.ts

@@ -0,0 +1,14 @@
+^^type ^^Callback <^^T> = ^^(error: Error, value: T) => any
+
+^^type Callback^^<T > = ^^(error: Error, value: T) ^^=> ^^any
+
+type Callback = ^^(error: Error, value: T) => ^^any
+
+^^type ^^Callback^^<string ^^| ^^(a: number, b: string) => ^^void> = ^^(error: Error, value: T) => ^^any
+
+^^ type ^^Foo <^^T > = ^^{
+
+	^^foo: ^^T,
+	^^bar: ^^number
+
+^^}