microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-23 19:07:27 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

make index signature fix work with generics

Browse Source
This commit is contained in:
Arthur Ozga 2016-12-08 17:19:19 -08:00
parent 2f51b363bf
commit 97b3d7a9ef
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/checker.ts
View File

@ -79,6 +79,7 @@ namespace ts {
getDeclaredTypeOfSymbol,
getPropertiesOfType,
getPropertyOfType,
getIndexInfoOfType,
getSignaturesOfType,
getIndexTypeOfType,
getBaseTypes,

1
src/compiler/types.ts
View File

@ -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[];

4
src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
View File

@ -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);
}

6
tests/cases/fourslash/codeFixUnImplementedInterfaceIndexSignaturesString.ts
View File

@ -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;