Render arguments should maintain correct precedence

lib/liquid.rb

@@ -40,6 +40,7 @@ module Liquid
   QuotedString                = /"[^"]*"|'[^']*'/
   QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
   TagAttributes               = /(\w[\w-]*)\s*\:\s*(#{QuotedFragment})/o
+  ContextInheritance          = /\.\.\./
   AnyStartingTag              = /#{TagStart}|#{VariableStart}/o
   PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
   TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/om

lib/liquid/tags/render.rb

@@ -42,10 +42,6 @@ module Liquid
       @is_for_loop
     end
 
-    def inherit_context?
-      @inherit_context
-    end
-
     def render_to_output_buffer(context, output)
       render_tag(context, output)
     end
@@ -77,20 +73,21 @@ module Liquid
           inner_context.partial = true
         end
 
-        if is_inline && inherit_context?
+        inner_context['forloop'] = forloop if forloop
-          context.scopes.each do |scope|
-            scope.each do |key, value|
-              inner_context[key] = value
-            end
-          end
-        end
 
         @attributes.each do |key, value|
+          if key == "..." && is_inline
+            context.scopes.each do |scope|
+              scope.each do |k, v|
+                inner_context[k] = v
+              end
+            end
+          else
             inner_context[key] = context.evaluate(value)
           end
+        end
 
         inner_context[context_variable_name] = var unless var.nil?
-        inner_context['forloop'] = forloop if forloop
 
         partial.render_to_output_buffer(inner_context, output)
         forloop&.send(:increment!)
@@ -119,14 +116,6 @@ module Liquid
 
       p.consume?(:comma)
 
-      @inherit_context = false
-      # ... inline snippets syntax
-      if p.consume?(:dotdotdot)
-        p.consume?(:comma)
-
-        @inherit_context = true
-      end
-
       @attributes = {}
       while p.look(:id)
         key = p.consume
@@ -162,13 +151,18 @@ module Liquid
       @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
       @template_name_expr = parse_expression(template_name)
       @is_for_loop = (with_or_for == FOR)
-      @inherit_context = markup.include?('...')
 
       @attributes = {}
-      markup.scan(TagAttributes) do |key, value|
+      markup.scan(/(#{ContextInheritance})|#{TagAttributes.source}/) do |context_marker, key, value|
+        if context_marker
+          @attributes.delete("...")
+          @attributes["..."] = true
+        elsif key && value
+          @attributes.delete(key)
           @attributes[key] = parse_expression(value)
         end
       end
+    end
 
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children

test/integration/tags/snippet_test.rb

@@ -5,6 +5,7 @@ require 'test_helper'
 class SnippetTest < Minitest::Test
   include Liquid
 
+  class LaxMode < SnippetTest
     def test_valid_inline_snippet
       template = <<~LIQUID.strip
         {% snippet input %}
@@ -318,34 +319,6 @@ class SnippetTest < Minitest::Test
       assert_template_result(expected, template)
     end
 
-  def test_render_inline_snippet_with_outside_context_rigid
-    template = <<~LIQUID.strip
-      {% assign color_scheme = 'dark' %}
-
-      {% snippet header %}
-      <div class="header header--{{ color_scheme }}">
-        {{ message }}
-      </div>
-      {% endsnippet %}
-
-
-      {% render header, ..., message: 'Welcome!' %}
-    LIQUID
-    expected = <<~OUTPUT
-
-
-
-
-
-
-      <div class="header header--dark">
-        Welcome!
-      </div>
-    OUTPUT
-
-    assert_template_result(expected, template, error_mode: :rigid)
-  end
-
     def test_inline_snippet_local_scope_takes_precedence
       template = <<~LIQUID
         {% assign color_scheme = 'dark' %}
@@ -383,6 +356,96 @@ class SnippetTest < Minitest::Test
       assert_template_result(expected, template)
     end
 
+    def test_render_inline_snippet_with_correct_argument_precedence
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, message: 'Welcome!', ... %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Goodbye!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template)
+    end
+
+    def test_render_inline_snippet_with_correct_argument_order
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header,  ..., message: 'Welcome!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Welcome!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template)
+    end
+
+    def test_render_inline_snippet_with_correct_duplicate_argument_precedence
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, message: 'Welcome!', ..., message: 'Hi!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Hi!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template)
+    end
+
     def test_render_captured_snippet
       template = <<~LIQUID
         {% assign color_scheme = 'dark' %}
@@ -557,4 +620,622 @@ class SnippetTest < Minitest::Test
 
       assert_template_result(expected, template)
     end
+  end
+
+  class RigidMode < SnippetTest
+    def test_valid_inline_snippet
+      template = <<~LIQUID.strip
+        {% snippet input %}
+          Hey
+        {% endsnippet %}
+      LIQUID
+      expected = ''
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet
+      template = <<~LIQUID.strip
+        {% snippet hey %}
+        Hey
+        {% endsnippet %}
+
+        {%- render hey -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+        Hey
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_variable
+      template = <<~LIQUID.strip
+        {% snippet hey %}
+        <p>Today is {{ "hello" | capitalize }}</p>
+        {% endsnippet %}
+
+        {%- render hey -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+        <p>Today is Hello</p>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_multiple_inline_snippets
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        <input />
+        {% endsnippet %}
+
+        {% snippet banner %}
+        <marquee direction="up" height="100px">
+          Welcome to my store!
+        </marquee>
+        {% endsnippet %}
+
+        {%- render input -%}
+        {%- render banner -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <input />
+
+        <marquee direction="up" height="100px">
+          Welcome to my store!
+        </marquee>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_argument
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        <input type="{{ type }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text" -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+        <input type="text" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_doc_tag
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        {% doc  %}
+          @param {string} type - Input type.
+        {% enddoc %}
+
+        <input type="{{ type }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text" -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <input type="text" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_evaluated_assign
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        <h1>{{ greeting }}</h1>
+        {% endsnippet %}
+
+        {%- assign greeting = "hello" | upcase -%}
+        {%- render input, greeting: greeting  -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+        <h1>HELLO</h1>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_multiple_arguments
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        {% doc %}
+          @param {string} type - Input type.
+          @param {string} value - Input value.
+        {% enddoc %}
+
+        <input type="{{ type }}" value="{{ value }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text", value: "Hello" -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <input type="text" value="Hello" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippets_using_same_argument_name
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        <input type="{{ type }}" />
+        {% endsnippet %}
+
+        {% snippet inputs %}
+        <input type="{{ type }}" value="{{ value }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text" -%}
+        {%- render inputs, type: "password", value: "pass" -%}
+      LIQUID
+
+      expected = <<~OUTPUT
+
+
+
+        <input type="text" />
+
+        <input type="password" value="pass" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_empty_string_when_missing_argument
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        {% doc %}
+          @param {string} type - Input type.
+          @param {string} value - Input value.
+        {% enddoc %}
+
+        <input type="{{ type }}" value="{{ value }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text" -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <input type="text" value="" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_shouldnt_leak_context
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        {% doc %}
+          @param {string} type - Input type.
+          @param {string} value - Input value.
+        {% enddoc %}
+
+        <input type="{{ type }}" value="{{ value }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text", value: "Hello" -%}
+
+        {{ type }}
+        {{ value }}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <input type="text" value="Hello" />
+
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_multiple_inline_snippets_without_leaking_context
+      template = <<~LIQUID.strip
+        {% snippet input %}
+        {% doc %}
+          @param {string} type - Input type.
+        {% enddoc %}
+
+        <input type="{{ type }}" />
+        {% endsnippet %}
+
+        {% snippet no_leak %}
+        <input type="{{ type }}" />
+        {% endsnippet %}
+
+        {%- render input, type: "text" -%}
+        {%- render no_leak -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+        <input type="text" />
+
+        <input type="" />
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_without_outside_context
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, message: 'Welcome!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+        <div class="header header--">
+          Welcome!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_outside_context
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, ..., message: 'Welcome!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+        <div class="header header--dark">
+          Welcome!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_inline_snippet_local_scope_takes_precedence
+      template = <<~LIQUID
+        {% assign color_scheme = 'dark' %}
+
+        {% snippet header %}
+        {% assign color_scheme = 'light' %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+        {{ color_scheme }}
+
+        {% render header, ..., message: 'Welcome!' %}
+
+        {{ color_scheme }}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+        dark
+
+
+
+        <div class="header header--light">
+          Welcome!
+        </div>
+
+
+        dark
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_correct_argument_precedence
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, message: 'Welcome!', ... %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Goodbye!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_correct_argument_order
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, ..., message: 'Welcome!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Welcome!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with_correct_duplicate_argument_precedence
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign message = 'Goodbye!' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+
+        {% render header, message: 'Welcome!', ..., message: 'Hi!' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <div class="header header--dark">
+          Hi!
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_captured_snippet
+      template = <<~LIQUID
+        {% assign color_scheme = 'dark' %}
+
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }}
+        </div>
+        {% endsnippet %}
+
+        {% capture up_header %}
+        {%- render header, ..., message: 'Welcome!' -%}
+        {% endcapture %}
+
+        {{ up_header | upcase }}
+
+        {{ header | upcase }}
+
+        {{ header }}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+        <DIV CLASS="HEADER HEADER--DARK">
+          WELCOME!
+        </DIV>
+
+
+        SNIPPETDROP
+
+        SnippetDrop
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_snippets_as_arguments
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+
+        {% snippet header %}
+          <div class="header header--{{ color_scheme }}">
+            {{ message }}
+          </div>
+        {% endsnippet %}
+
+        {% snippet main %}
+        {% assign color_scheme = 'auto' %}
+
+        <div class="main main--{{ color_scheme }}">
+        {% render header, ..., message: 'Welcome!' %}
+        </div>
+        {% endsnippet %}
+
+        {% render main, header: header %}
+      LIQUID
+
+      expected = <<~OUTPUT
+
+
+
+
+
+
+
+
+
+        <div class="main main--auto">
+
+          <div class="header header--auto">
+            Welcome!
+          </div>
+
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_forloop
+      template = <<~LIQUID.strip
+        {% snippet item %}
+        <li>{{ forloop.index }}: {{ item }}</li>
+        {% endsnippet %}
+
+        {% assign items = "A,B,C" | split: "," %}
+        {%- render item for items -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <li>1: A</li>
+
+        <li>2: B</li>
+
+        <li>3: C</li>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_with
+      template = <<~LIQUID.strip
+        {% snippet header %}
+        <div>{{ header }}</div>
+        {% endsnippet %}
+
+        {% assign product = "Apple" %}
+        {%- render header with product -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <div>Apple</div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_alias
+      template = <<~LIQUID.strip
+        {% snippet product_card %}
+        <div class="product">{{ item }}</div>
+        {% endsnippet %}
+
+        {% assign featured = "Apple" %}
+        {%- render product_card with featured as item -%}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+        <div class="product">Apple</div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+
+    def test_render_inline_snippet_inside_loop
+      template = <<~LIQUID.strip
+        {% assign color_scheme = 'dark' %}
+        {% assign array = '1,2,3' | split: ',' %}
+
+        {% for i in array %}
+        {% snippet header %}
+        <div class="header header--{{ color_scheme }}">
+          {{ message }} {{ i }}
+        </div>
+        {% endsnippet %}
+        {% endfor %}
+
+        {% render header, ..., message: '👉' %}
+      LIQUID
+      expected = <<~OUTPUT
+
+
+
+
+
+
+        <div class="header header--dark">
+          👉#{" "}
+        </div>
+      OUTPUT
+
+      assert_template_result(expected, template, error_mode: :rigid)
+    end
+  end
 end