From d661e15ce2296b7a7d4ceb3ca6ba2c73aa64be77 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Wed, 15 Jul 2015 20:23:24 +0100 Subject: [PATCH] force push newline for line comments when in compact mode - fixes #2006 --- packages/babel/src/generation/index.js | 2 +- packages/babel/test/fixtures/generation/compact/options.json | 3 +++ .../fixtures/generation/compact/single-line-comment/actual.js | 2 ++ .../generation/compact/single-line-comment/expected.js | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 packages/babel/test/fixtures/generation/compact/options.json create mode 100644 packages/babel/test/fixtures/generation/compact/single-line-comment/actual.js create mode 100644 packages/babel/test/fixtures/generation/compact/single-line-comment/expected.js diff --git a/packages/babel/src/generation/index.js b/packages/babel/src/generation/index.js index 6790be88c6..68a6703852 100644 --- a/packages/babel/src/generation/index.js +++ b/packages/babel/src/generation/index.js @@ -456,7 +456,7 @@ class CodeGenerator { // force a newline for line comments when retainLines is set in case the next printed node // doesn't catch up - if (this.format.retainLines && comment.type === "CommentLine") { + if ((this.format.compact || this.format.retainLines) && comment.type === "CommentLine") { val += "\n"; } diff --git a/packages/babel/test/fixtures/generation/compact/options.json b/packages/babel/test/fixtures/generation/compact/options.json new file mode 100644 index 0000000000..eb4e948bfa --- /dev/null +++ b/packages/babel/test/fixtures/generation/compact/options.json @@ -0,0 +1,3 @@ +{ + "compact": true +} diff --git a/packages/babel/test/fixtures/generation/compact/single-line-comment/actual.js b/packages/babel/test/fixtures/generation/compact/single-line-comment/actual.js new file mode 100644 index 0000000000..e2589c7138 --- /dev/null +++ b/packages/babel/test/fixtures/generation/compact/single-line-comment/actual.js @@ -0,0 +1,2 @@ +// foo +bar(); diff --git a/packages/babel/test/fixtures/generation/compact/single-line-comment/expected.js b/packages/babel/test/fixtures/generation/compact/single-line-comment/expected.js new file mode 100644 index 0000000000..e2589c7138 --- /dev/null +++ b/packages/babel/test/fixtures/generation/compact/single-line-comment/expected.js @@ -0,0 +1,2 @@ +// foo +bar();