microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-19 01:33:15 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Preserve newlines on either side of a binary expression.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2015-03-07 12:54:12 -08:00
parent 62d304b069
commit 680e48f507
14 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/compiler/emitter.ts
View File

@@ -3290,26 +3290,46 @@ module ts {
else {
emit(node.left);
if (node.operatorToken.kind !== SyntaxKind.CommaToken) {
write(" ");
// If there was a newline between the left side of the binary expression and the
// operator, then try to preserve that.
var indented = false;
var isSynthesied = nodeIsSynthesized(node);
if (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.left, node.operatorToken)) {
indented = true;
increaseIndent();
writeLine();
}
else {
// Otherwise just emit the operator right afterwards. For everything but
// comma, emit a space before the operator.
if (node.operatorToken.kind !== SyntaxKind.CommaToken) {
write(" ");
}
}
write(tokenToString(node.operatorToken.kind));
var shouldPlaceOnNewLine = !nodeIsSynthesized(node) && !nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right);
// If there was a newline after the operator (or this is a synthesized node that
// wants to be on a new line), then put a newline in. But only if we haven't
// already done this for the left side.
var wantsIndent = (!isSynthesied && !nodeEndIsOnSameLineAsNodeStart(node.operatorToken, node.right)) ||
synthesizedNodeStartsOnNewLine(node.right);
// Check if the right expression is on a different line versus the operator itself. If so,
// we'll emit newline.
if (shouldPlaceOnNewLine || synthesizedNodeStartsOnNewLine(node.right)) {
if (wantsIndent && !indented) {
indented = true;
increaseIndent();
writeLine();
emit(node.right);
decreaseIndent();
}
else {
write(" ");
emit(node.right);
}
// If we indented the left or the right side, then dedent now.
if (indented) {
decreaseIndent();
}
}
}