Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/compiler/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,6 @@ module ts {
var sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap ? [] : undefined;
var diagnostics: Diagnostic[] = [];
var newLine = host.getNewLine();
var preserveNewLines = compilerOptions.preserveNewLines || false;

if (targetSourceFile === undefined) {
forEach(host.getSourceFiles(), sourceFile => {
Expand Down Expand Up @@ -1572,6 +1571,7 @@ module ts {
var writeLine = writer.writeLine;
var increaseIndent = writer.increaseIndent;
var decreaseIndent = writer.decreaseIndent;
var preserveNewLines = compilerOptions.preserveNewLines || false;

var currentSourceFile: SourceFile;

Expand Down Expand Up @@ -3034,10 +3034,10 @@ module ts {
}

function indentIfOnDifferentLines(parent: Node, node1: Node, node2: Node) {
// Use a newline for existin code if the original had one, and we're preserving formatting.
// Use a newline for existing code if the original had one, and we're preserving formatting.
var realNodesAreOnDifferentLines = preserveNewLines && !nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);

// Always use a newline for synthesized code if hte generator asked for it.
// Always use a newline for synthesized code if the synthesizer desires it.
var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);

if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
Expand Down