Merge 274148d into 910ab1d

marko-js · Jan 15, 2019 · 95e8db4 · 95e8db4
2 parents 910ab1d + 274148d
commit 95e8db4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/compiler/ast/Scriptlet.js b/src/compiler/ast/Scriptlet.js
@@ -22,13 +22,17 @@ class Scriptlet extends Node {
             return;
         }
 
-        if (typeof code === "string") {
+        if (typeof code === "string" && this.block) {
             code = adjustIndent(code, writer.currentIndent);
         }
 
         writer.write(code);
         writer.write("\n");
     }
+
+    walk(walker) {
+        this.code = walker.walk(this.code);
+    }
 }
 
 module.exports = Scriptlet;
diff --git a/src/compiler/ast/TemplateLiteral.js b/src/compiler/ast/TemplateLiteral.js
@@ -49,6 +49,10 @@ class TemplateLiteral extends Node {
         writer.write(quote + code + quote);
         writer.write("\n");
     }
+
+    walk(walker) {
+        this.expressions = walker.walk(this.expressions);
+    }
 }
 
 function escapeQuasi(quasi, quote) {

diff --git a/src/compiler/ast/Vars.js b/src/compiler/ast/Vars.js
@@ -63,7 +63,7 @@ class Vars extends Node {
     }
 
     walk(walker) {
-        this.argument = walker.walk(this.argument);
+        this.declarations = walker.walk(this.declarations);
     }
 
     /**

diff --git a/test/vdom-compiler/fixtures/attrs-dynamic/expected.js b/test/vdom-compiler/fixtures/attrs-dynamic/expected.js
@@ -15,9 +15,9 @@ function render(input, out, __component, component, state) {
   var data = input;
 
   var attrs = {
-      foo: "bar",
-      hello: "world"
-    }
+    foo: "bar",
+    hello: "world"
+  }
 
   out.e("DIV", marko_attrs(attrs), null, null, 3)
     .t("Hello ")
@@ -30,4 +30,4 @@ marko_template._ = marko_renderer(render, {
     ___type: marko_componentType
   });
 
-marko_template.Component = marko_defineComponent({}, marko_template._);
+marko_template.Component = marko_defineComponent({}, marko_template._);