Skip to content

Commit 97f18c9

Browse files
author
Arthur Ozga
committed
Cleanup
1 parent 4af3937 commit 97f18c9

File tree

5 files changed

+7
-18
lines changed

5 files changed

+7
-18
lines changed

src/compiler/checker.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,10 @@ namespace ts {
8383
getSignaturesOfType,
8484
getIndexTypeOfType,
8585
getBaseTypes,
86-
getUnionType,
87-
getIntersectionType,
88-
getTypeFromTypeReference,
86+
getTypeFromTypeNode,
8987
getReturnTypeOfSignature,
9088
getNonNullableType,
9189
getSymbolsInScope,
92-
createSymbol,
9390
getSymbolAtLocation,
9491
getShorthandAssignmentValueSymbol,
9592
getExportSpecifierLocalTargetSymbol,
@@ -19743,9 +19740,6 @@ namespace ts {
1974319740
// This is a declaration, call getSymbolOfNode
1974419741
return getSymbolOfNode(node.parent);
1974519742
}
19746-
else if (node.kind === SyntaxKind.ClassKeyword && node.parent.kind === SyntaxKind.ClassExpression) {
19747-
return getSymbolOfNode(node.parent);
19748-
}
1974919743
else if (isLiteralComputedPropertyDeclarationName(node)) {
1975019744
return getSymbolOfNode(node.parent.parent);
1975119745
}

src/compiler/diagnosticMessages.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,10 +3203,6 @@
32033203
"category": "Message",
32043204
"code": 90004
32053205
},
3206-
"Implement interface on reference": {
3207-
"category": "Message",
3208-
"code": 90005
3209-
},
32103206
"Implement interface '{0}'.": {
32113207
"category": "Message",
32123208
"code": 90006

src/compiler/types.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,8 +2341,6 @@ namespace ts {
23412341
getBaseTypes(type: InterfaceType): ObjectType[];
23422342
getReturnTypeOfSignature(signature: Signature): Type;
23432343
getNonNullableType(type: Type): Type;
2344-
getIntersectionType(types: Type[], aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type;
2345-
getUnionType(types: Type[], subtypeReduction?: boolean, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type;
23462344

23472345
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
23482346
getSymbolAtLocation(node: Node): Symbol;
@@ -2351,11 +2349,10 @@ namespace ts {
23512349
getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol;
23522350
getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol;
23532351
getTypeAtLocation(node: Node): Type;
2354-
getTypeFromTypeReference(node: TypeReferenceNode | ExpressionWithTypeArguments | JSDocTypeReference): Type;
2352+
getTypeFromTypeNode(node: TypeNode): Type;
23552353
signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
23562354
typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
23572355
symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
2358-
createSymbol(flags: SymbolFlags, name: string): Symbol;
23592356
getSymbolDisplayBuilder(): SymbolDisplayBuilder;
23602357
getFullyQualifiedName(symbol: Symbol): string;
23612358
getAugmentedPropertiesOfType(type: Type): Symbol[];

src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace ts.codefix {
2525

2626
const result: CodeAction[] = [];
2727
for (const implementedTypeNode of implementedTypeNodes) {
28-
const implementedType = checker.getTypeFromTypeReference(implementedTypeNode) as InterfaceType;
28+
const implementedType = checker.getTypeFromTypeNode(implementedTypeNode) as InterfaceType;
2929
// Note that this is ultimately derived from a map indexed by symbol names,
3030
// so duplicates cannot occur.
3131
const implementedTypeSymbols = checker.getPropertiesOfType(implementedType);

src/services/codefixes/helpers.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ namespace ts.codefix {
8787
}
8888

8989
function createBodySignatureWithAnyTypes(signatures: Signature[], enclosingDeclaration: ClassLikeDeclaration, checker: TypeChecker): Signature {
90-
9190
const newSignatureDeclaration = createNode(SyntaxKind.CallSignature) as SignatureDeclaration;
9291
newSignatureDeclaration.parent = enclosingDeclaration;
9392
newSignatureDeclaration.name = signatures[0].getDeclaration().name;
@@ -126,7 +125,8 @@ namespace ts.codefix {
126125

127126
function createParameterDeclarationWithoutType(index: number, minArgCount: number, enclosingSignatureDeclaration: SignatureDeclaration): ParameterDeclaration {
128127
const newParameter = createNode(SyntaxKind.Parameter) as ParameterDeclaration;
129-
newParameter.symbol = checker.createSymbol(SymbolFlags.FunctionScopedVariable, maxArgsParameterSymbolNames[index] || "rest");
128+
129+
newParameter.symbol = new SymbolConstructor(SymbolFlags.FunctionScopedVariable, maxArgsParameterSymbolNames[index] || "rest");
130130
newParameter.symbol.valueDeclaration = newParameter;
131131
newParameter.symbol.declarations = [newParameter];
132132
newParameter.parent = enclosingSignatureDeclaration;
@@ -151,4 +151,6 @@ namespace ts.codefix {
151151
}
152152
return "";
153153
}
154+
155+
const SymbolConstructor = objectAllocator.getSymbolConstructor();
154156
}

0 commit comments

Comments
 (0)