Skip to content

Commit 32dfd33

Browse files
nbelzerelia
andcommitted
Fix regression for trailing erb tag
Co-authored-by: Elia Schito <[email protected]>
1 parent 05dd8a8 commit 32dfd33

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

lib/erb/formatter.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ def indented(string, strip: true)
222222

223223
def format_text(text)
224224
p format_text: text if @debug
225+
return unless text
226+
225227
starting_space = text.match?(/\A\s/)
226228

227229
final_newlines_count = text.match(/(\s*)\z/m).captures.last.count("\n")
@@ -289,7 +291,7 @@ def format_erb_tags(string)
289291
if erb_scanner.scan_until(erb_tags_regexp)
290292
p PRE_MATCH: [erb_pre_pos, '..', erb_scanner.pre_match] if @debug
291293
erb_pre_match = erb_scanner.pre_match
292-
erb_pre_match = erb_pre_match[erb_pre_pos..]
294+
erb_pre_match = erb_pre_match[erb_pre_pos..].to_s
293295
erb_pre_pos = erb_scanner.pos
294296

295297
erb_code = erb_tags[erb_scanner.captures.first]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<%= render Component.new do %>
2+
·
3+
<%= link_to "foo",
4+
bar_path %><% end %>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<%= render Component.new do %>
2+
·
3+
<%= link_to "foo", bar_path %><% end %>

0 commit comments

Comments
 (0)