Skip to content

Commit 53a40b9

Browse files
committed
change emitter behavior
1 parent 426e93f commit 53a40b9

File tree

5 files changed

+6
-205
lines changed

5 files changed

+6
-205
lines changed

src/compiler/emitter.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,6 @@ export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFi
862862
inlineSources: compilerOptions.inlineSources,
863863
extendedDiagnostics: compilerOptions.extendedDiagnostics,
864864
writeBundleFileInfo: !!bundleBuildInfo,
865-
preserveSourceNewlines: true,
866865
relativeToBuildInfo
867866
};
868867

@@ -4868,26 +4867,20 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
48684867

48694868
function emitEmbeddedStatement(parent: Node, node: Statement) {
48704869
const lines = getLeadingLineTerminatorCount(parent, node, ListFormat.None);
4871-
if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine || !lines) {
4870+
if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine || (preserveSourceNewlines && !lines)) {
48724871
writeSpace();
48734872
emit(node);
48744873
}
48754874
else {
4876-
if (lines) {
4877-
writeLine(lines);
4878-
increaseIndent();
4879-
if (isEmptyStatement(node)) {
4880-
pipelineEmit(EmitHint.EmbeddedStatement, node);
4881-
}
4882-
else {
4883-
emit(node);
4884-
}
4885-
decreaseIndent();
4875+
writeLine();
4876+
increaseIndent();
4877+
if (isEmptyStatement(node)) {
4878+
pipelineEmit(EmitHint.EmbeddedStatement, node);
48864879
}
48874880
else {
4888-
writeSpace();
48894881
emit(node);
48904882
}
4883+
decreaseIndent();
48914884
}
48924885
}
48934886

tests/baselines/reference/preserveSpace.js

Lines changed: 0 additions & 47 deletions
This file was deleted.

tests/baselines/reference/preserveSpace.symbols

Lines changed: 0 additions & 50 deletions
This file was deleted.

tests/baselines/reference/preserveSpace.types

Lines changed: 0 additions & 73 deletions
This file was deleted.

tests/cases/conformance/preserveSpace.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)