Skip to content

Commit d3b2a84

Browse files
committed
format
1 parent 794e70b commit d3b2a84

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

src/compiler/checker.ts

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6049,7 +6049,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
60496049
/*internalFlags*/ undefined,
60506050
/*tracker*/ undefined,
60516051
verbosityLevel,
6052-
out);
6052+
out,
6053+
);
60536054
const printer = createPrinterWithRemoveCommentsOmitTrailingSemicolon();
60546055
const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
60556056
printer.writeNode(EmitHint.Unspecified, sig!, /*sourceFile*/ sourceFile, getTrailingSemicolonDeferringWriter(writer)); // TODO: GH#18217
@@ -6377,7 +6378,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
63776378
/*tracker*/ undefined,
63786379
verbosityLevel,
63796380
context => symbolToDeclarationsWorker(symbol, context),
6380-
out);
6381+
out,
6382+
);
63816383
return mapDefined(nodes, node => {
63826384
switch (node.kind) {
63836385
case SyntaxKind.ClassDeclaration:
@@ -6484,7 +6486,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
64846486
out: {
64856487
couldUnfoldMore: false,
64866488
truncated: false,
6487-
}
6489+
},
64886490
};
64896491
context.tracker = new SymbolTrackerImpl(context, tracker, moduleResolverHost);
64906492
const resultingNode = cb(context);
@@ -7011,17 +7013,17 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
70117013
}
70127014
// Always use 'typeof T' for type of class, enum, and module objects
70137015
else if (
7014-
!forceExpansion &&
7016+
!forceExpansion &&
70157017
(symbol.flags & SymbolFlags.Class
7016-
&& !forceClassExpansion
7017-
&& !getBaseTypeVariableOfClass(symbol)
7018-
&& !(symbol.valueDeclaration
7019-
&& isClassLike(symbol.valueDeclaration)
7020-
&& context.flags & NodeBuilderFlags.WriteClassExpressionAsTypeLiteral
7021-
&& (!isClassDeclaration(symbol.valueDeclaration)
7022-
|| isSymbolAccessible(symbol, context.enclosingDeclaration, isInstanceType, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible))
7023-
|| symbol.flags & (SymbolFlags.Enum | SymbolFlags.ValueModule)
7024-
|| shouldWriteTypeOfFunctionSymbol())
7018+
&& !forceClassExpansion
7019+
&& !getBaseTypeVariableOfClass(symbol)
7020+
&& !(symbol.valueDeclaration
7021+
&& isClassLike(symbol.valueDeclaration)
7022+
&& context.flags & NodeBuilderFlags.WriteClassExpressionAsTypeLiteral
7023+
&& (!isClassDeclaration(symbol.valueDeclaration)
7024+
|| isSymbolAccessible(symbol, context.enclosingDeclaration, isInstanceType, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible))
7025+
|| symbol.flags & (SymbolFlags.Enum | SymbolFlags.ValueModule)
7026+
|| shouldWriteTypeOfFunctionSymbol())
70257027
) {
70267028
if (canUnfoldType(type, context)) {
70277029
context.depth += 1;
@@ -9787,7 +9789,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
97879789
}
97889790

97899791
function serializeModule(symbol: Symbol, symbolName: string, modifierFlags: ModifierFlags) {
9790-
const members = getNamespaceMembersForSerialization(symbol);
9792+
const members = getNamespaceMembersForSerialization(symbol);
97919793
const unfolding = isUnfolding(context);
97929794
// Split NS members up by declaration - members whose parent symbol is the ns symbol vs those whose is not (but were added in later via merging)
97939795
const locationMap = arrayToMultiMap(members, m => m.parent && m.parent === symbol || unfolding ? "real" : "merged");
@@ -9871,7 +9873,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
98719873
initializer,
98729874
);
98739875
members.push(member);
9874-
};
9876+
}
98759877
addResult(
98769878
factory.createEnumDeclaration(
98779879
factory.createModifiersFromModifierFlags(isConstEnumSymbol(symbol) ? ModifierFlags.Const : 0),
@@ -9898,7 +9900,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
98989900
}
98999901

99009902
function createTruncationStatement(dotDotDotText: string): Statement {
9901-
return factory.createExpressionStatement(factory.createIdentifier(dotDotDotText))
9903+
return factory.createExpressionStatement(factory.createIdentifier(dotDotDotText));
99029904
}
99039905

99049906
function getSignatureTextRangeLocation(signature: Signature) {
@@ -10580,7 +10582,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1058010582
Debug.assert(!!setter);
1058110583
const paramSymbol = isFunctionLikeDeclaration(setter) ? getSignatureFromDeclaration(setter).parameters[0] : undefined;
1058210584
const setterDeclaration = p.declarations?.find(isSetAccessor);
10583-
context.approximateLength += modifiersLength(flag) + 7 + (paramSymbol ? symbolName(paramSymbol).length : 5) + (omitType? 0 : 1); // `modifiers set name(param);`, approximate name
10585+
context.approximateLength += modifiersLength(flag) + 7 + (paramSymbol ? symbolName(paramSymbol).length : 5) + (omitType ? 0 : 1); // `modifiers set name(param);`, approximate name
1058410586
result.push(setTextRange(
1058510587
context,
1058610588
factory.createSetAccessorDeclaration(
@@ -10600,7 +10602,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1060010602
}
1060110603
if (p.flags & SymbolFlags.GetAccessor) {
1060210604
const getterDeclaration = p.declarations?.find(isGetAccessor);
10603-
context.approximateLength += modifiersLength(flag) + 9 + (omitType? 0 : 1); // `modifiers get name(): ;`, approximate name
10605+
context.approximateLength += modifiersLength(flag) + 9 + (omitType ? 0 : 1); // `modifiers get name(): ;`, approximate name
1060410606
result.push(setTextRange(
1060510607
context,
1060610608
factory.createGetAccessorDeclaration(
@@ -10619,7 +10621,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1061910621
// If this happens, we assume the accessor takes priority, as it imposes more constraints
1062010622
else if (p.flags & (SymbolFlags.Property | SymbolFlags.Variable | SymbolFlags.Accessor)) {
1062110623
const modifierFlags = (isReadonlySymbol(p) ? ModifierFlags.Readonly : 0) | flag;
10622-
context.approximateLength += 1 + (omitType? 0 : 1) + modifiersLength(modifierFlags); // `modifiers name: ;`, approximate name
10624+
context.approximateLength += 1 + (omitType ? 0 : 1) + modifiersLength(modifierFlags); // `modifiers name: ;`, approximate name
1062310625
return setTextRange(
1062410626
context,
1062510627
createProperty(

src/services/symbolDisplay.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
805805
documentation,
806806
symbolKind,
807807
tags: tags.length === 0 ? undefined : tags,
808-
canIncreaseVerbosityLevel: verbosityLevel !== undefined ? canIncreaseVerbosityLevel : undefined
808+
canIncreaseVerbosityLevel: verbosityLevel !== undefined ? canIncreaseVerbosityLevel : undefined,
809809
};
810810

811811
function getPrinter() {
@@ -871,7 +871,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
871871
}
872872

873873
function tryUnfoldSymbol(symbol: Symbol, meaning: SemanticMeaning): boolean {
874-
if (hasUnfoldedSymbol) {
874+
if (hasUnfoldedSymbol) {
875875
return true;
876876
}
877877
if (canUnfoldSymbol(symbol, typeWriterOut)) {
@@ -882,7 +882,8 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
882882
symbolMeaning,
883883
TypeFormatFlags.MultilineObjectLiterals | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope,
884884
verbosityLevel !== undefined ? verbosityLevel - 1 : undefined,
885-
typeWriterOut);
885+
typeWriterOut,
886+
);
886887
const printer = getPrinter();
887888
nodes.forEach((node, i) => {
888889
if (i > 0) writer.writeLine();

0 commit comments

Comments
 (0)