Skip to content

Commit 3428e27

Browse files
committed
Reorder tsconfig and move one more function
1 parent 6eacc9c commit 3428e27

File tree

4 files changed

+26
-39
lines changed

4 files changed

+26
-39
lines changed

src/services/codefixes/fixAddMissingMember.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,6 @@ namespace ts.codefix {
8383
},
8484
});
8585

86-
function getAllSupers(decl: ClassOrInterface | undefined, checker: TypeChecker): readonly ClassOrInterface[] {
87-
const res: ClassLikeDeclaration[] = [];
88-
while (decl) {
89-
const superElement = getClassExtendsHeritageElement(decl);
90-
const superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression);
91-
const superDecl = superSymbol && find(superSymbol.declarations, isClassLike);
92-
if (superDecl) { res.push(superDecl); }
93-
decl = superDecl;
94-
}
95-
return res;
96-
}
97-
98-
type ClassOrInterface = ClassLikeDeclaration | InterfaceDeclaration;
9986
const enum InfoKind { Enum, ClassOrInterface }
10087
interface EnumInfo {
10188
readonly kind: InfoKind.Enum;

src/services/codefixes/fixPropertyOverrideAccessor.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace ts.codefix {
3434
endPosition = context.span.start + context.span.length
3535
}
3636
else if (context.errorCode === Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor.code) {
37+
// TODO: A lot of these should be bails instead of asserts
3738
const checker = context.program.getTypeChecker()
3839
const node = getTokenAtPosition(context.sourceFile, context.span.start).parent;
3940
Debug.assert(isAccessor(node), "it wasn't an accessor");
@@ -55,19 +56,4 @@ namespace ts.codefix {
5556
const refactorContext = { ...context, file: context.sourceFile, startPosition, endPosition }
5657
return getEditsForAction(refactorContext, Diagnostics.Generate_get_and_set_accessors.message);
5758
}
58-
59-
// TODO: Stolen from a different codefix, should dedupe it somewhere.
60-
function getAllSupers(decl: ClassOrInterface | undefined, checker: TypeChecker): readonly ClassOrInterface[] {
61-
const res: ClassLikeDeclaration[] = [];
62-
while (decl) {
63-
const superElement = getClassExtendsHeritageElement(decl);
64-
const superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression);
65-
const superDecl = superSymbol && find(superSymbol.declarations, isClassLike);
66-
if (superDecl) { res.push(superDecl); }
67-
decl = superDecl;
68-
}
69-
return res;
70-
}
71-
72-
type ClassOrInterface = ClassLikeDeclaration | InterfaceDeclaration;
7359
}

src/services/codefixes/generateAccessors.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ts.codefix {
1717
}
1818

1919
// TODO: Use a general type instead of Refactor* types
20-
// TODO: Rename this to show that it generates accessor
20+
// TODO: Rename this to show that it generates accessors
2121
export function getEditsForAction(context: RefactorContext, _actionName: string): RefactorEditInfo | undefined {
2222
const { file } = context;
2323

@@ -217,4 +217,18 @@ namespace ts.codefix {
217217
}
218218
});
219219
}
220+
221+
export function getAllSupers(decl: ClassOrInterface | undefined, checker: TypeChecker): readonly ClassOrInterface[] {
222+
const res: ClassLikeDeclaration[] = [];
223+
while (decl) {
224+
const superElement = getClassExtendsHeritageElement(decl);
225+
const superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression);
226+
const superDecl = superSymbol && find(superSymbol.declarations, isClassLike);
227+
if (superDecl) { res.push(superDecl); }
228+
decl = superDecl;
229+
}
230+
return res;
231+
}
232+
233+
export type ClassOrInterface = ClassLikeDeclaration | InterfaceDeclaration;
220234
}

src/services/tsconfig.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,30 @@
6161
"codefixes/correctQualifiedNameToIndexedAccessType.ts",
6262
"codefixes/convertToTypeOnlyExport.ts",
6363
"codefixes/convertToTypeOnlyImport.ts",
64+
"codefixes/fixClassIncorrectlyImplementsInterface.ts",
65+
"codefixes/importFixes.ts",
66+
"codefixes/fixImplicitThis.ts",
67+
"codefixes/fixSpelling.ts",
68+
"codefixes/returnValueCorrect.ts",
6469
"codefixes/fixAddMissingMember.ts",
6570
"codefixes/fixAddMissingNewOperator.ts",
66-
"codefixes/fixAwaitInSyncFunction.ts",
6771
"codefixes/fixCannotFindModule.ts",
6872
"codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
69-
"codefixes/fixClassIncorrectlyImplementsInterface.ts",
7073
"codefixes/fixClassSuperMustPrecedeThisAccess.ts",
7174
"codefixes/fixConstructorForDerivedNeedSuperCall.ts",
7275
"codefixes/fixEnableExperimentalDecorators.ts",
7376
"codefixes/fixEnableJsxFlag.ts",
77+
"codefixes/fixModuleAndTargetOptions.ts",
7478
"codefixes/fixExtendsInterfaceBecomesImplements.ts",
7579
"codefixes/fixForgottenThisPropertyAccess.ts",
76-
"codefixes/fixImplicitThis.ts",
7780
"codefixes/fixInvalidJsxCharacters.ts",
81+
"codefixes/fixUnusedIdentifier.ts",
82+
"codefixes/fixUnreachableCode.ts",
83+
"codefixes/fixUnusedLabel.ts",
7884
"codefixes/fixJSDocTypes.ts",
7985
"codefixes/fixMissingCallParentheses.ts",
80-
"codefixes/fixModuleAndTargetOptions.ts",
86+
"codefixes/fixAwaitInSyncFunction.ts",
8187
"codefixes/fixPropertyOverrideAccessor.ts",
82-
"codefixes/fixSpelling.ts",
83-
"codefixes/fixUnreachableCode.ts",
84-
"codefixes/fixUnusedIdentifier.ts",
85-
"codefixes/fixUnusedLabel.ts",
86-
"codefixes/importFixes.ts",
87-
"codefixes/returnValueCorrect.ts",
8888
"codefixes/inferFromUsage.ts",
8989
"codefixes/disableJsDiagnostics.ts",
9090
"codefixes/helpers.ts",

0 commit comments

Comments
 (0)