Prevent the transformation of multiline do-end blocks to single-line …

…blocks with curly braces by syntax_tree
nebulab · Jul 7, 2023 · 72d613e · 72d613e
1 parent 9645bf3
commit 72d613e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lib/erb/formatter.rb b/lib/erb/formatter.rb
@@ -213,8 +213,12 @@ def format_text(text)
 
   def format_ruby(code, autoclose: false, extra_indent: 0)
     if autoclose
-      code += "\nend" unless RUBY_OPEN_BLOCK["#{code}\nend"]
-      code += "\n}" unless RUBY_OPEN_BLOCK["#{code}\n}"]
+      # A long placeholder is added to prevent the transformation of
+      # multiline do-end blocks to single-line blocks with curly braces by syntax_tree.
+      placeholder = "placeholder_#{SecureRandom.hex(@line_width / 2)}"
+
+      code += "\n#{placeholder}\nend" unless RUBY_OPEN_BLOCK["#{code}\nend"]
+      code += "\n#{placeholder}\n}" unless RUBY_OPEN_BLOCK["#{code}\n}"]
     end
 
     p RUBY_IN_: code if @debug
@@ -229,8 +233,8 @@ def format_ruby(code, autoclose: false, extra_indent: 0)
       code
     end
 
+    code = code.split(placeholder).first.rstrip if autoclose
     lines = code.lines(chomp: true)
-    lines.delete_at(-1) if autoclose
 
     indent = "\s" * extra_indent
 

diff --git a/test/fixtures/short-do-end-block.html.erb b/test/fixtures/short-do-end-block.html.erb
@@ -0,0 +1,3 @@
+<% [1, 2, 3].each do |i| %>
+  <%= i %>
+<% end %>
diff --git a/test/fixtures/short-do-end-block.html.expected.erb b/test/fixtures/short-do-end-block.html.expected.erb
@@ -0,0 +1,3 @@
+<% [1, 2, 3].each do |i| %>
+  <%= i %>
+<% end %>