Add union check to improved error message (microsoft#23027)

weswigham · web-flow · commit 8543d303726c · 2018-03-30T16:23:24.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -26626,7 +26626,7 @@ namespace ts {
                                               typeToString(getTypeFromTypeNode(node.type)));
                 }
 
-                if (allTypesAssignableToKind(type, TypeFlags.StringLiteral, /*strict*/ true)) {
+                if (type.flags & TypeFlags.Union && allTypesAssignableToKind(type, TypeFlags.StringLiteral, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name,
                                               Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
                 }
diff --git a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.errors.txt b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts(1,33): error TS1023: An index signature parameter type must be 'string' or 'number'.
+
+
+==== tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts (1 errors) ====
+    type Wat<T extends string> = { [x: T]: string };
+                                    ~
+!!! error TS1023: An index signature parameter type must be 'string' or 'number'.
diff --git a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.js b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.js
@@ -0,0 +1,4 @@
+//// [genericIndexTypeHasSensibleErrorMessage.ts]
+type Wat<T extends string> = { [x: T]: string };
+
+//// [genericIndexTypeHasSensibleErrorMessage.js]
diff --git a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.symbols b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts ===
+type Wat<T extends string> = { [x: T]: string };
+>Wat : Symbol(Wat, Decl(genericIndexTypeHasSensibleErrorMessage.ts, 0, 0))
+>T : Symbol(T, Decl(genericIndexTypeHasSensibleErrorMessage.ts, 0, 9))
+>x : Symbol(x, Decl(genericIndexTypeHasSensibleErrorMessage.ts, 0, 32))
+>T : Symbol(T, Decl(genericIndexTypeHasSensibleErrorMessage.ts, 0, 9))
+
diff --git a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts ===
+type Wat<T extends string> = { [x: T]: string };
+>Wat : Wat<T>
+>T : T
+>x : T
+>T : T
+
diff --git a/tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts b/tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts
@@ -0,0 +1 @@
+type Wat<T extends string> = { [x: T]: string };

Original file line number	Diff line number	Diff line change
`@@ -26626,7 +26626,7 @@ namespace ts {`
`26626`	`26626`	`typeToString(getTypeFromTypeNode(node.type)));`
`26627`	`26627`	`}`
`26628`	`26628`
`26629`		`- if (allTypesAssignableToKind(type, TypeFlags.StringLiteral, /strict/ true)) {`
	`26629`	`+ if (type.flags & TypeFlags.Union && allTypesAssignableToKind(type, TypeFlags.StringLiteral, /strict/ true)) {`
`26630`	`26630`	`return grammarErrorOnNode(parameter.name,`
`26631`	`26631`	`Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);`
`26632`	`26632`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+type Wat<T extends string> = { [x: T]: string };`