Skip to content

Commit 8be8819

Browse files
author
Arthur Ozga
committed
simplify and inline methods
1 parent 4b02099 commit 8be8819

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

src/compiler/checker.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ namespace ts {
9696
getTypeAtLocation: getTypeOfNode,
9797
getPropertySymbolOfDestructuringAssignment,
9898
signatureToString,
99-
indexSignatureToString,
10099
typeToString,
101100
getSymbolDisplayBuilder,
102101
symbolToString,
@@ -2037,15 +2036,6 @@ namespace ts {
20372036
return result;
20382037
}
20392038

2040-
function indexSignatureToString(info: IndexInfo, kind: IndexKind, enclosingDeclaration?: Node): string {
2041-
const writer = getSingleLineStringWriter();
2042-
getSymbolDisplayBuilder().buildIndexSignatureDisplay(info, writer, kind, enclosingDeclaration);
2043-
const result = writer.string();
2044-
releaseStringWriter(writer);
2045-
2046-
return result;
2047-
}
2048-
20492039
function typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string {
20502040
const writer = getSingleLineStringWriter();
20512041
getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);

src/compiler/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2353,7 +2353,6 @@ namespace ts {
23532353
getTypeAtLocation(node: Node): Type;
23542354
getTypeFromTypeReference(node: TypeReferenceNode | ExpressionWithTypeArguments | JSDocTypeReference): Type;
23552355
signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
2356-
indexSignatureToString(info: IndexInfo, kind: IndexKind, enclosingDeclaration?: Node): string;
23572356
typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
23582357
symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
23592358
createSymbol(flags: SymbolFlags, name: string): Symbol;

src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace ts.codefix {
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);
32-
const nonPrivateMembers = implementedTypeSymbols.filter(symbolRefersToNonPrivateMember);
32+
const nonPrivateMembers = implementedTypeSymbols.filter(symbol => !(getModifierFlags(symbol.valueDeclaration) & ModifierFlags.Private));
3333

3434
let insertion = getMissingIndexSignatureInsertion(implementedType, IndexKind.Number, classDecl, hasNumericIndexSignature);
3535
insertion += getMissingIndexSignatureInsertion(implementedType, IndexKind.String, classDecl, hasStringIndexSignature);
@@ -47,18 +47,17 @@ namespace ts.codefix {
4747
if (!hasIndexSigOfKind) {
4848
const IndexInfoOfKind = checker.getIndexInfoOfType(type, kind);
4949
if (IndexInfoOfKind) {
50-
return checker.indexSignatureToString(IndexInfoOfKind, kind, enclosingDeclaration);
50+
const writer = getSingleLineStringWriter();
51+
checker.getSymbolDisplayBuilder().buildIndexSignatureDisplay(IndexInfoOfKind, writer, kind, enclosingDeclaration);
52+
const result = writer.string();
53+
releaseStringWriter(writer);
54+
55+
return result;
5156
}
5257
}
5358
return "";
5459
}
5560

56-
function symbolRefersToNonPrivateMember(symbol: Symbol): boolean {
57-
const decls = symbol.getDeclarations();
58-
Debug.assert(!!(decls && decls.length > 0));
59-
return !(getModifierFlags(decls[0]) & ModifierFlags.Private);
60-
}
61-
6261
function pushAction(result: CodeAction[], insertion: string, description: string): void {
6362
const newAction: CodeAction = {
6463
description: description,

0 commit comments

Comments
 (0)