Merge pull request microsoft#17767 from tycho01/15768-generic-numeric…

…-index-error loosen number index check, fixes microsoft#15768
weswigham · Aug 14, 2017 · a1cbeb2 · a1cbeb2
2 parents 543e0af + 4268e13
commit a1cbeb2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18761,13 +18761,10 @@ namespace ts {
             if (isTypeAssignableTo(indexType, getIndexType(objectType))) {
                 return type;
             }
-            // Check if we're indexing with a numeric type and the object type is a generic
-            // type with a constraint that has a numeric index signature.
-            if (maybeTypeOfKind(objectType, TypeFlags.TypeVariable) && isTypeAssignableToKind(indexType, TypeFlags.NumberLike)) {
-                const constraint = getBaseConstraintOfType(objectType);
-                if (constraint && getIndexInfoOfType(constraint, IndexKind.Number)) {
-                    return type;
-                }
+            // Check if we're indexing with a numeric type and if either object or index types
+            // is a generic type with a constraint that has a numeric index signature.
+            if (getIndexInfoOfType(getApparentType(objectType), IndexKind.Number) && isTypeAssignableToKind(indexType, TypeFlags.NumberLike)) {
+                return type;
             }
             error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
             return type;

diff --git a/tests/baselines/reference/genericNumberIndex.js b/tests/baselines/reference/genericNumberIndex.js
@@ -0,0 +1,5 @@
+//// [genericNumberIndex.ts]
+type X<I extends number> = ['a'][I];
+
+
+//// [genericNumberIndex.js]
diff --git a/tests/baselines/reference/genericNumberIndex.symbols b/tests/baselines/reference/genericNumberIndex.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/genericNumberIndex.ts ===
+type X<I extends number> = ['a'][I];
+>X : Symbol(X, Decl(genericNumberIndex.ts, 0, 0))
+>I : Symbol(I, Decl(genericNumberIndex.ts, 0, 7))
+>I : Symbol(I, Decl(genericNumberIndex.ts, 0, 7))
+
diff --git a/tests/baselines/reference/genericNumberIndex.types b/tests/baselines/reference/genericNumberIndex.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/genericNumberIndex.ts ===
+type X<I extends number> = ['a'][I];
+>X : ["a"][I]
+>I : I
+>I : I
+
diff --git a/tests/cases/compiler/genericNumberIndex.ts b/tests/cases/compiler/genericNumberIndex.ts
@@ -0,0 +1 @@
+type X<I extends number> = ['a'][I];