make index signature fix work with generics

Arthur Ozga · Arthur Ozga · commit 97b3d7a9ef67 · 2016-12-08T17:19:19.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -79,6 +79,7 @@ namespace ts {
             getDeclaredTypeOfSymbol,
             getPropertiesOfType,
             getPropertyOfType,
+            getIndexInfoOfType,
             getSignaturesOfType,
             getIndexTypeOfType,
             getBaseTypes,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2335,6 +2335,7 @@ namespace ts {
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
         getPropertyOfType(type: Type, propertyName: string): Symbol;
+        getIndexInfoOfType(type: Type, kind: IndexKind): IndexInfo;
         getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
         getIndexTypeOfType(type: Type, kind: IndexKind): Type;
         getBaseTypes(type: InterfaceType): ObjectType[];
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -31,14 +31,14 @@ namespace ts.codefix {
                 let insertion = "";
 
                 if (!hasNumericIndexSignature) {
-                    const typeNumericIndexInfo = implementedType.declaredNumberIndexInfo;
+                    const typeNumericIndexInfo = checker.getIndexInfoOfType(implementedType, IndexKind.Number);
                     if (typeNumericIndexInfo) {
                         insertion = checker.indexSignatureToString(typeNumericIndexInfo, SyntaxKind.NumberKeyword, classDecl);
                     }
                 }
 
                 if (!hasStringIndexSignature) {
-                    const typeStringIndexInfo = implementedType.declaredStringIndexInfo;
+                    const typeStringIndexInfo = checker.getIndexInfoOfType(implementedType, IndexKind.String);
                     if (typeStringIndexInfo) {
                         insertion += checker.indexSignatureToString(typeStringIndexInfo, SyntaxKind.StringKeyword, classDecl);
                     }
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesString.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesString.ts
@@ -1,10 +1,10 @@
 /// <reference path='fourslash.ts' />
 
-//// interface I {
-////     [x: string]: number;
+//// interface I<X> {
+////     [x: string]: X;
 //// }
 ////
-//// class C implements I {[| |]}
+//// class C implements I<number> {[| |]}
 
 verify.rangeAfterCodeFix(`
     [x: string]: number;

Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,14 @@ namespace ts.codefix {`
`31`	`31`	`let insertion = "";`
`32`	`32`
`33`	`33`	`if (!hasNumericIndexSignature) {`
`34`		`- const typeNumericIndexInfo = implementedType.declaredNumberIndexInfo;`
	`34`	`+ const typeNumericIndexInfo = checker.getIndexInfoOfType(implementedType, IndexKind.Number);`
`35`	`35`	`if (typeNumericIndexInfo) {`
`36`	`36`	`insertion = checker.indexSignatureToString(typeNumericIndexInfo, SyntaxKind.NumberKeyword, classDecl);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (!hasStringIndexSignature) {`
`41`		`- const typeStringIndexInfo = implementedType.declaredStringIndexInfo;`
	`41`	`+ const typeStringIndexInfo = checker.getIndexInfoOfType(implementedType, IndexKind.String);`
`42`	`42`	`if (typeStringIndexInfo) {`
`43`	`43`	`insertion += checker.indexSignatureToString(typeStringIndexInfo, SyntaxKind.StringKeyword, classDecl);`
`44`	`44`	`}`