Minor fixes

ahejlsberg · ahejlsberg · commit 8d87971feebf · 2016-10-28T15:35:15.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5744,7 +5744,7 @@ namespace ts {
 
         function getIndexedAccessType(objectType: Type, indexType: Type, errorNode?: Node) {
             if (indexType.flags & TypeFlags.TypeParameter) {
-                if (!isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType), getIndexType(objectType))) {
+                if (!isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType, getIndexType(objectType))) {
                     if (errorNode) {
                         error(errorNode, Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
                     }
@@ -11549,9 +11549,8 @@ namespace ts {
                 return objectType;
             }
 
-            if (indexType.flags & TypeFlags.TypeParameter &&
-                isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType), getIndexType(objectType))) {
-                return getIndexedAccessType(objectType, indexType);
+            if (indexType.flags & TypeFlags.TypeParameter) {
+                return getIndexedAccessType(objectType, indexType, node.argumentExpression);
             }
 
             objectType = getApparentType(objectType);

Original file line number	Diff line number	Diff line change
`@@ -5744,7 +5744,7 @@ namespace ts {`
`5744`	`5744`
`5745`	`5745`	`function getIndexedAccessType(objectType: Type, indexType: Type, errorNode?: Node) {`
`5746`	`5746`	`if (indexType.flags & TypeFlags.TypeParameter) {`
`5747`		`- if (!isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType), getIndexType(objectType))) {`
	`5747`	`+ if (!isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType) \|\| emptyObjectType, getIndexType(objectType))) {`
`5748`	`5748`	`if (errorNode) {`
`5749`	`5749`	`error(errorNode, Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));`
`5750`	`5750`	`}`
`@@ -11549,9 +11549,8 @@ namespace ts {`
`11549`	`11549`	`return objectType;`
`11550`	`11550`	`}`
`11551`	`11551`
`11552`		`- if (indexType.flags & TypeFlags.TypeParameter &&`
`11553`		`- isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType), getIndexType(objectType))) {`
`11554`		`- return getIndexedAccessType(objectType, indexType);`
	`11552`	`+ if (indexType.flags & TypeFlags.TypeParameter) {`
	`11553`	`+ return getIndexedAccessType(objectType, indexType, node.argumentExpression);`
`11555`	`11554`	`}`
`11556`	`11555`
`11557`	`11556`	`objectType = getApparentType(objectType);`