.

Author: karreiro

example/server/templates/index.liquid

@@ -1,6 +1,3 @@
-<p>Hello world!</p>
+{% let hey = 'guilherme' %}
 
-<p>It is {{date}}</p>
-
-
-<p>Check out the <a href="/products">Products</a> screen </p>
+{{ hey | upcase }}

lib/liquid/tags/let.rb

@@ -111,15 +111,20 @@ def children
 
     private
 
-    MULTI_VALUE_KEYWORDS = %w[options accept].freeze
+    MULTI_VALUE_KEYWORDS = ['options', 'accept'].freeze
 
     def build_metadata_json(context, default_val)
       parts = []
       parts << "\"type\":#{json_encode(@inferred_type)}"
       parts << "\"default\":#{json_encode(default_val)}"
 
+      if context.template_name
+        parts << "\"template\":#{json_encode(context.template_name)}"
+      end
+
       @attributes.each do |key, expr|
         next if key == "type"
+
         parts << "#{json_encode(key)}:#{json_encode(context.evaluate(expr))}"
       end
 
@@ -158,7 +163,7 @@ def lax_parse_keywords(remaining)
             if remaining =~ /\A,\s*/
               after_comma = Regexp.last_match.post_match
               # If next token after comma is a keyword: pattern, stop consuming values
-              if after_comma =~ /\A(\w[\w-]*)\s*:/
+              if /\A(\w[\w-]*)\s*:/.match?(after_comma)
                 remaining = after_comma
                 break
               else
@@ -173,12 +178,10 @@ def lax_parse_keywords(remaining)
           else
             @accept_list = values
           end
-        else
-          if remaining =~ /\A(#{QuotedFragment})/o
-            @attributes[key] = parse_expression(Regexp.last_match(1))
-            remaining = Regexp.last_match.post_match.strip
-            remaining = remaining.sub(/\A,\s*/, '')
-          end
+        elsif remaining =~ /\A(#{QuotedFragment})/o
+          @attributes[key] = parse_expression(Regexp.last_match(1))
+          remaining = Regexp.last_match.post_match.strip
+          remaining = remaining.sub(/\A,\s*/, '')
         end
       end
     end