From 2d7703afd972a2168b8b510a8c9af5f2863368b3 Mon Sep 17 00:00:00 2001 From: chico Date: Wed, 21 Dec 2016 19:14:39 +0300 Subject: [PATCH 1/2] Like was discussed in Slack chat with @ljharb and @hzoo spaces was added with no particular reason. https://babeljs.slack.com/archives/discussion/p1481744017001806 I'm still not sure if everything here is correct (for example source maps) --- .../src/generators/template-literals.js | 2 -- .../templates-indentation/expected.js | 8 ++++---- .../harmony-edgecase/templates/expected.js | 14 +++++++------- .../expected.js | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/babel-generator/src/generators/template-literals.js b/packages/babel-generator/src/generators/template-literals.js index a8234a00a8..127b64b0cd 100644 --- a/packages/babel-generator/src/generators/template-literals.js +++ b/packages/babel-generator/src/generators/template-literals.js @@ -9,9 +9,7 @@ export function TemplateElement(node: Object, parent: Object) { let value = (isFirst ? "`" : "}") + node.value.raw + (isLast ? "`" : "${"); - if (!isFirst) this.space(); this.token(value); - if (!isLast) this.space(); } export function TemplateLiteral(node: Object) { diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/expected.js b/packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/expected.js index 1f664f0ae2..50f361c162 100644 --- a/packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/expected.js +++ b/packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/expected.js @@ -1,15 +1,15 @@ function multilineTemplate() { return `I'm done reconfoobling -${ 'the energy motron' } - ${ '...or whatever' }`; +${'the energy motron'} + ${'...or whatever'}`; } { const foo = `spam and eggs!`; - const bar = `${ 4 + 2 }`; + const bar = `${4 + 2}`; const hello = `Hello -${ 'world' }`; +${'world'}`; } diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/templates/expected.js b/packages/babel-generator/test/fixtures/harmony-edgecase/templates/expected.js index 93ff1e3ebb..476203f277 100644 --- a/packages/babel-generator/test/fixtures/harmony-edgecase/templates/expected.js +++ b/packages/babel-generator/test/fixtures/harmony-edgecase/templates/expected.js @@ -15,17 +15,17 @@ Is the order a rabbit? `; var middles = ` -Is the order ${ order }? +Is the order ${order}? `; var middles = ` -Is the order ${ order }? +Is the order ${order}? `; var middles = ` -1. ${ cocoa } -2. ${ chino } -3. ${ rize } -4. ${ syaro } -5. ${ chiya } +1. ${cocoa} +2. ${chino} +3. ${rize} +4. ${syaro} +5. ${chiya} `; diff --git a/packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/expected.js b/packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/expected.js index 455ed642b5..b1cd86e7e2 100644 --- a/packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/expected.js +++ b/packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/expected.js @@ -3,7 +3,7 @@ html``; `multi lines`; -`test ${ interpolation } test`; +`test ${interpolation} test`; `foob From 07b5b0edf83b2f735564400252c9039322b709b4 Mon Sep 17 00:00:00 2001 From: chico Date: Wed, 21 Dec 2016 19:28:36 +0300 Subject: [PATCH 2/2] fix one more fixture --- .../test/fixtures/regression/4403/expected.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4403/expected.js b/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4403/expected.js index dbf2e9bdb1..32e1b04280 100644 --- a/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4403/expected.js +++ b/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4403/expected.js @@ -1,3 +1,3 @@ var a, b; -var _ref = `${ b++ }`; +var _ref = `${b++}`; a[_ref] = Math.pow(a[_ref], 1)