marcoroth · joelhawksley · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026
diff --git a/lib/herb/engine/compiler.rb b/lib/herb/engine/compiler.rb
@@ -350,11 +350,14 @@ def process_erb_tag(node, skip_comment_check: false)
         end
         return if erb_graphql?(opening)
 
-        code = node.content.value.strip
+        raw_content = node.content.value
+        code = raw_content.strip
 
         if erb_output?(opening)
           process_erb_output(node, opening, code)
         else
+          code = "\n#{code}" if raw_content.start_with?("\n")
+          code = "#{code}\n" if raw_content.match?(/\n[ \t]*\z/)
           apply_trim(node, code)
         end
       end
@@ -590,7 +593,11 @@ def apply_trim(node, code)
         if at_line_start?
           leading_space = extract_and_remove_leading_space!
           effective_leading_space = leading_space.empty? ? removed_whitespace : leading_space
-          right_space = Herb::Engine.heredoc?(code) ? "\n" : " \n"
+          right_space = if code.end_with?("\n") || Herb::Engine.heredoc?(code)
+                          "\n"
+                        else
+                          " \n"
+                        end
 
           @pending_leading_whitespace_insert_index = @tokens.length
           @pending_leading_whitespace = effective_leading_space if !effective_leading_space.empty? && follows_newline

diff --git a/test/engine/whitespace_trimming_test.rb b/test/engine/whitespace_trimming_test.rb
@@ -364,5 +364,17 @@ class WhitespaceTrimmingTest < Minitest::Spec
       assert_compiled_snapshot(template)
       assert_evaluated_snapshot(template, enforce_erubi_equality: true)
     end
+
+    test "multi-line code block preserves line count parity with erubi" do
+      template = "<%\n  x = 1\n  y = 2\n%>\n<%= x %>"
+
+      herb_engine = assert_compiled_snapshot(template)
+      erubi_engine = Erubi::Engine.new(template)
+
+      assert_equal erubi_engine.src.lines.count, herb_engine.src.lines.count,
+                   "Herb should preserve line count for multi-line code blocks.\n  " \
+                   "Erubi (#{erubi_engine.src.lines.count} lines): #{erubi_engine.src.inspect}\n  " \
+                   "Herb  (#{herb_engine.src.lines.count} lines): #{herb_engine.src.inspect}"
+    end
   end
 end
diff --git a/...1_ruby_block_comments_with_=begin_and_=end_multiline_ff404c4e708f59f532b4042441e458ad.txt b/...1_ruby_block_comments_with_=begin_and_=end_multiline_ff404c4e708f59f532b4042441e458ad.txt
diff --git a/...s_test/test_0002_ruby_block_comments_inside_erb_tags_95bcfa3f3e28634bf923f18df0cd38a1.txt b/...s_test/test_0002_ruby_block_comments_inside_erb_tags_95bcfa3f3e28634bf923f18df0cd38a1.txt
diff --git a/..._0003_ruby_block_comments_with_code_before_and_after_0ee0ba8a9a25359175b884cf66f37b2c.txt b/..._0003_ruby_block_comments_with_code_before_and_after_0ee0ba8a9a25359175b884cf66f37b2c.txt
diff --git a/...d_=end_mutliline_and_no_space_before_ERB_closing_tag_72379778fa34572e48b949a780f761b1.txt b/...d_=end_mutliline_and_no_space_before_ERB_closing_tag_72379778fa34572e48b949a780f761b1.txt
diff --git a/...test_0019_heredoc_in_code_tag_compiles_to_valid_Ruby_4af6472f81c8026291897a7a34e6ae0b.txt b/...test_0019_heredoc_in_code_tag_compiles_to_valid_Ruby_4af6472f81c8026291897a7a34e6ae0b.txt
diff --git a/..._with_dash_syntax_in_code_tag_compiles_to_valid_Ruby_61fc267bae73b15dae254d0d5f9fbe0e.txt b/..._with_dash_syntax_in_code_tag_compiles_to_valid_Ruby_61fc267bae73b15dae254d0d5f9fbe0e.txt
diff --git a/...quoted_identifier_in_code_tag_compiles_to_valid_Ruby_c596f2621d8ae2223c3805e78ff1b3e3.txt b/...quoted_identifier_in_code_tag_compiles_to_valid_Ruby_c596f2621d8ae2223c3805e78ff1b3e3.txt
diff --git a/...compilation_test/test_0004_block_comment_compilation_d5c98b9f230e001f8aabf838d3774698.txt b/...compilation_test/test_0004_block_comment_compilation_d5c98b9f230e001f8aabf838d3774698.txt
diff --git a/...ne_code_block_preserves_line_count_parity_with_erubi_056ad410b82f521050ab536ab6d01f5f.txt b/...ne_code_block_preserves_line_count_parity_with_erubi_056ad410b82f521050ab536ab6d01f5f.txt