Merge pull request #2790 from moretti/issue-2613

Preserve indentation in template literals, fixes #2613

packages/babel-generator/src/generators/template-literals.js

@@ -18,7 +18,7 @@ export function TemplateLiteral(node: Object) {
     this.print(quasis[i], node);
 
     if (i + 1 < quasis.length) {
-      this.push("${ ");
+      this._push("${ ");
       this.print(node.expressions[i], node);
       this.push(" }");
     }

packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/actual.js

@@ -0,0 +1,18 @@
+function multilineTemplate() {
+  return `I'm done reconfoobling
+${ 'the energy motron' }
+      ${'...or whatever'}`;
+}
+
+{
+  const foo = `spam
+and eggs!`;
+
+  const bar = `${
+    4 +
+    2
+  }`;
+
+  const hello = `Hello
+${ 'world' }`;
+}

packages/babel-generator/test/fixtures/harmony-edgecase/templates-indentation/expected.js

@@ -0,0 +1,15 @@
+function multilineTemplate() {
+  return `I'm done reconfoobling
+${ 'the energy motron' }
+      ${ '...or whatever' }`;
+}
+
+{
+  const foo = `spam
+and eggs!`;
+
+  const bar = `${ 4 + 2 }`;
+
+  const hello = `Hello
+${ 'world' }`;
+}