fix bug with blocks compiled output

lib/reactionview/template/handlers/herb/herb.rb

@@ -55,6 +55,28 @@ def add_expression_block(indicator, code)
             add_rails_expression(indicator, code, wrap_parentheses: false)
           end
 
+          def add_expression_block_end(code)
+            flush_newline_if_pending(@src)
+
+            terminate_expression
+
+            trailing_newline = code.end_with?("\n")
+            code_stripped = code.chomp
+
+            @src.chomp! if @src.end_with?("\n") && code_stripped.start_with?(" ")
+
+            @src << " " << code_stripped
+
+            # Don't add closing parens — add_expression_block doesn't open any
+            @src << if code.include?("#") || trailing_newline
+                      "\n"
+                    else
+                      ";"
+                    end
+
+            @buffer_on_stack = false
+          end
+
           def add_rails_expression(indicator, code, wrap_parentheses:)
             flush_newline_if_pending(@src)
 

test/snapshot_utils.rb

@@ -104,39 +104,39 @@ def snapshot_changed?(content, source, options = {})
       previous_content = snapshot_file(source, options).read
 
       if previous_content == content
-        puts "\n\nSnapshot for '#{class_name} #{name}' didn't change: \n#{snapshot_file(source, options)}\n"
+        puts "\n\nSnapshot for '#{self.class.name} #{name}' didn't change: \n#{snapshot_file(source, options)}\n"
         false
       else
-        puts "\n\nSnapshot for '#{class_name} #{name}' changed:\n"
+        puts "\n\nSnapshot for '#{self.class.name} #{name}' changed:\n"
 
         puts Difftastic::Differ.new(color: :always).diff_strings(previous_content, content)
         puts "==============="
         true
       end
     else
-      puts "\n\nSnapshot for '#{class_name} #{name}' doesn't exist at: \n#{snapshot_file(source, options)}\n"
+      puts "\n\nSnapshot for '#{self.class.name} #{name}' doesn't exist at: \n#{snapshot_file(source, options)}\n"
       true
     end
   end
 
   def save_failures_to_snapshot(content, source, options = {})
     return unless snapshot_changed?(content, source, options)
 
-    puts "\n==== [ Input for '#{class_name} #{name}' ] ====="
+    puts "\n==== [ Input for '#{self.class.name} #{name}' ] ====="
     puts source
     puts "\n\n"
 
     if !ENV["FORCE_UPDATE_SNAPSHOTS"].nil? ||
-       ask?("Do you want to update (or create) the snapshot for '#{class_name} #{name}'?")
+       ask?("Do you want to update (or create) the snapshot for '#{self.class.name} #{name}'?")
 
-      puts "\nUpdating Snapshot for '#{class_name} #{name}' at: \n#{snapshot_file(source, options)}\n"
+      puts "\nUpdating Snapshot for '#{self.class.name} #{name}' at: \n#{snapshot_file(source, options)}\n"
 
       FileUtils.mkdir_p(snapshot_file(source, options).dirname)
       snapshot_file(source, options).write(content)
 
-      puts "\nSnapshot for '#{class_name} #{name}' written: \n#{snapshot_file(source, options)}\n"
+      puts "\nSnapshot for '#{self.class.name} #{name}' written: \n#{snapshot_file(source, options)}\n"
     else
-      puts "\nNot updating snapshot for '#{class_name} #{name}' at: \n#{snapshot_file(source, options)}.\n"
+      puts "\nNot updating snapshot for '#{self.class.name} #{name}' at: \n#{snapshot_file(source, options)}.\n"
     end
   end
 
@@ -164,9 +164,9 @@ def assert_snapshot_matches(actual, source, options = {}, mode: nil)
         #{Difftastic::Differ.new(color: :always).diff_strings(snapshot_file(source, snapshot_opts).read, actual)}
         \e[31m#{divider}
 
-        Snapshots for "#{class_name} #{name}" didn't match.
+        Snapshots for "#{self.class.name} #{name}" didn't match.
 
-        Run the test using UPDATE_SNAPSHOTS=true to update (or create) the snapshot file for "#{class_name} #{name}"
+        Run the test using UPDATE_SNAPSHOTS=true to update (or create) the snapshot file for "#{self.class.name} #{name}"
 
         UPDATE_SNAPSHOTS=true minitest #{e.location}
 

test/snapshots/herb/template_handler_test/test_0029_render_with_block_(e.g._component_with_do_end)_compiled_b5fda483cc761c0f82e314c67868839a.txt

@@ -0,0 +1,10 @@
+ if true 
+ @output_buffer.safe_append='  '.freeze; @output_buffer.append= content_tag(:div, class: "wrapper") do; @output_buffer.safe_append='
+    <p>Hello</p>
+'.freeze;   end 
+ else 
+ @output_buffer.safe_append='  '.freeze; @output_buffer.append= content_tag(:div, class: "fallback") do; @output_buffer.safe_append='
+    <p>Fallback</p>
+'.freeze;   end 
+ end 
+@output_buffer

test/snapshots/herb/template_handler_test/test_0029_render_with_block_(e.g._component_with_do_end)_evaluated_9dbc95a7606c9b1ff0bcff41b1248ccc.txt

@@ -0,0 +1,3 @@
+  <div class="wrapper">
+    <p>Hello</p>
+</div>

test/template/handlers/herb_test.rb

@@ -342,4 +342,21 @@ def @view_context.ui_badge(count, **_options)
     assert_compiled_snapshot(template)
     assert_evaluated_snapshot(template, ivars: { config: { key: "value" } })
   end
+
+  test "render with block (e.g. component with do/end)" do
+    template = <<~HTML
+      <% if true %>
+        <%= content_tag(:div, class: "wrapper") do %>
+          <p>Hello</p>
+        <% end %>
+      <% else %>
+        <%= content_tag(:div, class: "fallback") do %>
+          <p>Fallback</p>
+        <% end %>
+      <% end %>
+    HTML
+
+    assert_compiled_snapshot(template)
+    assert_evaluated_snapshot(template)
+  end
 end