Merge pull request #1818 from Shopify/tablerow-interrupt

Handle interrupts in table row
Shopify · Aug 15, 2024 · ac91d31 · ac91d31
2 parents fb6634f + 9067e51
commit ac91d31
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/lib/liquid/tags/table_row.rb b/lib/liquid/tags/table_row.rb
@@ -65,6 +65,12 @@ def render_to_output_buffer(context, output)
           super
           output << '</td>'
 
+          # Handle any interrupts if they exist.
+          if context.interrupt?
+            interrupt = context.pop_interrupt
+            break if interrupt.is_a?(BreakInterrupt)
+          end
+
           if tablerowloop.col_last && !tablerowloop.last
             output << "</tr>\n<tr class=\"row#{tablerowloop.row + 1}\">"
           end

diff --git a/test/integration/tags/table_row_test.rb b/test/integration/tags/table_row_test.rb
@@ -207,4 +207,52 @@ def test_table_row_renders_correct_error_message_for_invalid_parameters
       render_errors: true,
     )
   end
+
+  def test_table_row_handles_interrupts
+    assert_template_result(
+      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td></tr>\n",
+      '{% tablerow n in (1...3) cols:2 %} {{n}} {% break %} {{n}} {% endtablerow %}',
+    )
+
+    assert_template_result(
+      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 3 </td></tr>\n",
+      '{% tablerow n in (1...3) cols:2 %} {{n}} {% continue %} {{n}} {% endtablerow %}',
+    )
+  end
+
+  def test_table_row_does_not_leak_interrupts
+    template = <<~LIQUID
+      {% for i in (1..2) -%}
+      {% for j in (1..2) -%}
+      {% tablerow k in (1..3) %}{% break %}{% endtablerow -%}
+      loop j={{ j }}
+      {% endfor -%}
+      loop i={{ i }}
+      {% endfor -%}
+      after loop
+    LIQUID
+
+    expected = <<~STR
+      <tr class="row1">
+      <td class="col1"></td></tr>
+      loop j=1
+      <tr class="row1">
+      <td class="col1"></td></tr>
+      loop j=2
+      loop i=1
+      <tr class="row1">
+      <td class="col1"></td></tr>
+      loop j=1
+      <tr class="row1">
+      <td class="col1"></td></tr>
+      loop j=2
+      loop i=2
+      after loop
+    STR
+
+    assert_template_result(
+      expected,
+      template,
+    )
+  end
 end