Skip to content

Commit 35b56aa

Browse files
Further simplification.
1 parent 6340531 commit 35b56aa

File tree

1 file changed

+20
-28
lines changed

1 file changed

+20
-28
lines changed

src/compiler/emitter.ts

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3033,7 +3033,7 @@ module ts {
30333033
return false;
30343034
}
30353035

3036-
function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node, insertIfNoIndentValue?: string) {
3036+
function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node, valueToWriteWhenNotIndenting?: string) {
30373037
// Use a newline for existin code if the original had one, and we're preserving formatting.
30383038
var realNodesAreOnDifferentLines = preserveNewLines && !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
30393039

@@ -3046,8 +3046,8 @@ module ts {
30463046
return true;
30473047
}
30483048
else {
3049-
if (insertIfNoIndentValue) {
3050-
write(insertIfNoIndentValue);
3049+
if (valueToWriteWhenNotIndenting) {
3050+
write(valueToWriteWhenNotIndenting);
30513051
}
30523052
return false;
30533053
}
@@ -3059,15 +3059,11 @@ module ts {
30593059
}
30603060

30613061
emit(node.expression);
3062-
3063-
var indentBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
3062+
var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
30643063
write(".");
3065-
3066-
var indentAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
3064+
var indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
30673065
emit(node.name);
3068-
3069-
decreaseIndentIf(indentBeforeDot);
3070-
decreaseIndentIf(indentAfterDot);
3066+
decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
30713067
}
30723068

30733069
function emitQualifiedName(node: QualifiedName) {
@@ -3300,15 +3296,11 @@ module ts {
33003296
}
33013297
else {
33023298
emit(node.left);
3303-
3304-
var indentBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
3299+
var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== SyntaxKind.CommaToken ? " " : undefined);
33053300
write(tokenToString(node.operatorToken.kind));
3306-
3307-
var indentAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
3301+
var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
33083302
emit(node.right);
3309-
3310-
decreaseIndentIf(indentBeforeOperator);
3311-
decreaseIndentIf(indentAfterOperator);
3303+
decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
33123304
}
33133305
}
33143306

@@ -3318,23 +3310,23 @@ module ts {
33183310

33193311
function emitConditionalExpression(node: ConditionalExpression) {
33203312
emit(node.condition);
3321-
var indentBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
3313+
var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
33223314
write("?");
3323-
var indentAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
3315+
var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
33243316
emit(node.whenTrue);
3325-
decreaseIndentIf(indentBeforeQuestion);
3326-
decreaseIndentIf(indentAfterQuestion);
3327-
3328-
var indentBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
3317+
decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
3318+
var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
33293319
write(":");
3330-
var indentAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
3320+
var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
33313321
emit(node.whenFalse);
3332-
decreaseIndentIf(indentBeforeColon);
3333-
decreaseIndentIf(indentAfterColon);
3322+
decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
33343323
}
33353324

3336-
function decreaseIndentIf(value: boolean) {
3337-
if (value) {
3325+
function decreaseIndentIf(value1: boolean, value2?: boolean) {
3326+
if (value1) {
3327+
decreaseIndent();
3328+
}
3329+
if (value2) {
33383330
decreaseIndent();
33393331
}
33403332
}

0 commit comments

Comments
 (0)