Derive block_form? from @Body presence instead of tracking separately

@Body is only set in reparent_as_block, so it already encodes whether
the tag is in block form. Remove the redundant @block_form flag.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: charlespwd

History.md

@@ -1,5 +1,8 @@
 # Liquid Change Log
 
+## 5.12.0
+* Introduce HybridTag base class for tags that can be self-closing or block-form, with end-tag-triggered reparenting in BlockBody [CP Clermont]
+
 ## 5.11.0
 * Revert the Inline Snippets tag (#2001), treat its inclusion in the latest Liquid release as a bug, and allow for feedback on RFC#1916 to better support Liquid developers [Guilherme Carreiro]
 * Rename the `:rigid` error mode to `:strict2` and display a warning when users attempt to use the `:rigid` mode [Guilherme Carreiro]

lib/liquid/block_body.rb

@@ -52,15 +52,17 @@ def freeze
             next parse_liquid_tag(markup, parse_context)
           end
 
-          unless (tag = parse_context.environment.tag_for_name(tag_name))
-            if try_reparent_hybrid_tag(tag_name, parse_context)
-              parse_context.line_number = tokenizer.line_number
-              next
-            end
-            # end parsing if we reach an unknown tag and let the caller decide
-            # determine how to proceed
-            return yield tag_name, markup
+          tag = parse_context.environment.tag_for_name(tag_name)
+
+          if tag.nil? && try_reparent_hybrid_tag(tag_name, parse_context)
+            parse_context.line_number = tokenizer.line_number
+            next
           end
+
+          # end parsing if we reach an unknown tag and let the caller decide
+          # determine how to proceed
+          return yield tag_name, markup unless tag
+
           new_tag = tag.parse(tag_name, markup, tokenizer, parse_context)
           @blank &&= new_tag.blank?
           @nodelist << new_tag
@@ -151,15 +153,17 @@ def self.rescue_render_node(context, output, line_number, exc, blank_tag)
             next
           end
 
-          unless (tag = parse_context.environment.tag_for_name(tag_name))
-            if try_reparent_hybrid_tag(tag_name, parse_context)
-              parse_context.line_number = tokenizer.line_number
-              next
-            end
-            # end parsing if we reach an unknown tag and let the caller decide
-            # determine how to proceed
-            return yield tag_name, markup
+          tag = parse_context.environment.tag_for_name(tag_name)
+
+          if tag.nil? && try_reparent_hybrid_tag(tag_name, parse_context)
+            parse_context.line_number = tokenizer.line_number
+            next
           end
+
+          # end parsing if we reach an unknown tag and let the caller decide
+          # determine how to proceed
+          return yield tag_name, markup unless tag
+
           new_tag = tag.parse(tag_name, markup, tokenizer, parse_context)
           @blank &&= new_tag.blank?
           @nodelist << new_tag

lib/liquid/hybrid_tag.rb

@@ -3,18 +3,16 @@
 module Liquid
   class HybridTag < Block
     def reparent_as_block(children, parse_context)
-      @block_form = true
       @body = new_body
       @body.nodelist.concat(children)
       @body.freeze
     end
 
     def parse(_tokens)
-      @block_form = false
     end
 
     def block_form?
-      @block_form
+      !!@body
     end
 
     def nodelist
@@ -26,7 +24,7 @@ def blank?
     end
 
     def render_to_output_buffer(context, output)
-      if @block_form
+      if block_form?
         render_block_form_to_output_buffer(context, output)
       else
         render_self_closing_to_output_buffer(context, output)