Remove forloop guard

lib/liquid/block.rb

@@ -7,7 +7,6 @@ module Liquid
     def initialize(tag_name, markup, options)
       super
       @blank = true
-      @body = nil
     end
 
     def parse(tokens)
@@ -18,7 +17,7 @@ module Liquid
 
     # For backwards compatibility
     def render(context)
-      @body&.render(context)
+      @body.render(context)
     end
 
     def blank?

lib/liquid/tag.rb

@@ -2,7 +2,7 @@
 
 module Liquid
   class Tag
-    attr_reader :nodelist, :tag_name, :line_number, :parse_context, :markup
+    attr_reader :nodelist, :tag_name, :line_number, :parse_context
     alias_method :options, :parse_context
     include ParserSwitching
 
@@ -17,6 +17,8 @@ module Liquid
         disabled_tags.push(*tags)
       end
 
+      private :new
+
       def disabled_tags
         @disabled_tags ||= []
       end

lib/liquid/tags/assign.rb

@@ -18,7 +18,8 @@ module Liquid
 
     attr_reader :to, :from
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       if markup =~ Syntax
         @to = Regexp.last_match(1)
         @from = Variable.new(Regexp.last_match(2), options)

lib/liquid/tags/capture.rb

@@ -15,13 +15,13 @@ module Liquid
   class Capture < Block
     Syntax = /(#{VariableSignature}+)/o
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       if markup =~ Syntax
         @to = Regexp.last_match(1)
       else
         raise SyntaxError, options[:locale].t("errors.syntax.capture")
       end
-      super
     end
 
     def render_to_output_buffer(context, output)

lib/liquid/tags/case.rb

@@ -7,7 +7,8 @@ module Liquid
 
     attr_reader :blocks, :left
 
-    def parse(tokens)
+    def initialize(tag_name, markup, options)
+      super
       @blocks = []
 
       if markup =~ Syntax
@@ -15,7 +16,9 @@ module Liquid
       else
         raise SyntaxError, options[:locale].t("errors.syntax.case")
       end
+    end
 
+    def parse(tokens)
       body = BlockBody.new
       body = @blocks.last.attachment while parse_body(body, tokens)
     end

lib/liquid/tags/cycle.rb

@@ -19,7 +19,8 @@ module Liquid
 
     attr_reader :variables
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       case markup
       when NamedSyntax
         @variables = variables_from_string(Regexp.last_match(2))

lib/liquid/tags/decrement.rb

@@ -20,7 +20,8 @@ module Liquid
   #    Hello: -3
   #
   class Decrement < Tag
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       @variable = markup.strip
     end
 

lib/liquid/tags/echo.rb

@@ -12,14 +12,13 @@ module Liquid
   #   {% echo user | link %}
   #
   class Echo < Tag
-    attr_reader :variable
+    def initialize(tag_name, markup, parse_context)
-
+      super
-    def parse(_tokens)
       @variable = Variable.new(markup, parse_context)
     end
 
     def render(context)
-      variable&.render_to_output_buffer(context, +'')
+      @variable.render_to_output_buffer(context, +'')
     end
   end
 

lib/liquid/tags/for.rb

@@ -50,11 +50,15 @@ module Liquid
 
     attr_reader :collection_name, :variable_name, :limit, :from
 
-    def parse(tokens)
+    def initialize(tag_name, markup, options)
+      super
       @from = @limit = nil
       parse_with_selected_parser(markup)
       @for_block = BlockBody.new
       @else_block = nil
+    end
+
+    def parse(tokens)
       return unless parse_body(@for_block, tokens)
       parse_body(@else_block, tokens)
     end

lib/liquid/tags/if.rb

@@ -18,13 +18,17 @@ module Liquid
 
     attr_reader :blocks
 
+    def initialize(tag_name, markup, options)
+      super
+      @blocks = []
+      push_block('if', markup)
+    end
+
     def nodelist
       @blocks.map(&:attachment)
     end
 
     def parse(tokens)
-      @blocks = []
-      push_block('if', markup)
       while parse_body(@blocks.last.attachment, tokens)
       end
     end

lib/liquid/tags/include.rb

@@ -21,7 +21,9 @@ module Liquid
 
     attr_reader :template_name_expr, :variable_name_expr, :attributes
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
+
       if markup =~ SYNTAX
 
         template_name = Regexp.last_match(1)
@@ -41,6 +43,9 @@ module Liquid
       end
     end
 
+    def parse(_tokens)
+    end
+
     def render_to_output_buffer(context, output)
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name

lib/liquid/tags/increment.rb

@@ -17,7 +17,8 @@ module Liquid
   #    Hello: 2
   #
   class Increment < Tag
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       @variable = markup.strip
     end
 

lib/liquid/tags/raw.rb

@@ -5,8 +5,13 @@ module Liquid
     Syntax = /\A\s*\z/
     FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
 
-    def parse(tokens)
+    def initialize(tag_name, markup, parse_context)
+      super
+
       ensure_valid_markup(tag_name, markup, parse_context)
+    end
+
+    def parse(tokens)
       @body = +''
       while (token = tokens.shift)
         if token =~ FullTokenPossiblyInvalid

lib/liquid/tags/render.rb

@@ -8,7 +8,9 @@ module Liquid
 
     attr_reader :template_name_expr, :attributes
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
+
       raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
 
       template_name = Regexp.last_match(1)
@@ -41,19 +43,26 @@ module Liquid
 
       context_variable_name = @alias_name || template_name.split('/').last
 
-      render_partial_func = ->(var) {
+      render_partial_func = ->(var, forloop) {
         inner_context = context.new_isolated_subcontext
         inner_context.template_name = template_name
         inner_context.partial = true
+        inner_context['forloop'] = forloop if forloop
         @attributes.each do |key, value|
           inner_context[key] = context.evaluate(value)
         end
         inner_context[context_variable_name] = var unless var.nil?
         partial.render_to_output_buffer(inner_context, output)
+        forloop&.send(:increment!)
       }
 
       variable = @variable_name_expr ? context.evaluate(@variable_name_expr) : nil
-      variable.is_a?(Array) ? variable.each(&render_partial_func) : render_partial_func.call(variable)
+      if variable.is_a?(Array)
+        forloop = Liquid::ForloopDrop.new(template_name, variable.count, nil)
+        variable.each { |var| render_partial_func.call(var, forloop) }
+      else
+        render_partial_func.call(variable, nil)
+      end
 
       output
     end

lib/liquid/tags/table_row.rb

@@ -6,7 +6,8 @@ module Liquid
 
     attr_reader :variable_name, :collection_name, :attributes
 
-    def parse(_tokens)
+    def initialize(tag_name, markup, options)
+      super
       if markup =~ Syntax
         @variable_name = Regexp.last_match(1)
         @collection_name = Expression.parse(Regexp.last_match(2))
@@ -17,7 +18,6 @@ module Liquid
       else
         raise SyntaxError, options[:locale].t("errors.syntax.table_row")
       end
-      super
     end
 
     def render_to_output_buffer(context, output)

test/integration/tag_test.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class TagTest < Minitest::Test
-  include Liquid
-
-  def test_all_tags_with_no_parse_can_render
-    Template.tags.each do |key, _tag|
-      Template.tags[key].new(key, '', ParseContext.new).render(Context.new)
-      assert_nil(nil)
-    end
-  end
-
-  def test_all_tags_are_registered
-    tags = Template.tags.map { |key, _tag| key }
-    expected_tags = %w(assign break capture case comment continue cycle decrement echo for if ifchanged include increment raw render tablerow unless)
-    assert_equal(expected_tags, tags.sort)
-  end
-end

test/integration/tags/render_tag_test.rb

@@ -205,4 +205,13 @@ class RenderTagTest < Minitest::Test
     assert_template_result("Product: Draft 151cm Product: Element 155cm ",
                            "{% render 'product' for products %}", "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }])
   end
+
+  def test_render_tag_forloop
+    Liquid::Template.file_system = StubFileSystem.new(
+      'product' => "Product: {{ product.title }} {% if forloop.first %}first{% endif %} {% if forloop.last %}last{% endif %} index:{{ forloop.index }} ",
+    )
+
+    assert_template_result("Product: Draft 151cm first  index:1 Product: Element 155cm  last index:2 ",
+                           "{% render 'product' for products %}", "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }])
+  end
 end