Skip to content

Commit d6302c6

Browse files
committed
fix bug where newline behavior did not match erubi
1 parent 8eed9af commit d6302c6

File tree

17 files changed

+14
-42
lines changed

17 files changed

+14
-42
lines changed

β€Žlib/herb/engine/compiler.rbβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,16 @@ def add_context_aware_expression(code, context)
366366
def process_erb_tag(node, skip_comment_check: false)
367367
opening = node.tag_opening.value
368368

369-
return if !skip_comment_check && erb_comment?(opening)
369+
if !skip_comment_check && erb_comment?(opening)
370+
has_left_trim = opening.start_with?("<%-")
371+
remove_trailing_whitespace_from_last_token! if has_left_trim
372+
373+
if at_line_start?
374+
extract_and_remove_lspace!
375+
@trim_next_whitespace = true
376+
end
377+
return
378+
end
370379
return if erb_graphql?(opening)
371380

372381
code = node.content.value.strip

β€Žtest/snapshots/engine/debug_mode_test/test_0015_erb_comments_do_NOT_get_debug_markup_07372a921f413dd0d25e4fc4d599e417.txtβ€Ž

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/engine_erubi_compat_test/test_0005_handles_erb_comments_9c479c9d1b4668c4a5e3ecf9dfdc7d04.txtβ€Ž

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/engine_erubi_compat_test/test_0015_handles_multiple_erb_constructs_in_complex_template_8033045d7c8ec7030c37a69705c95b59.txtβ€Ž

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/engine_test/test_0012_comments_710fe3f51d746ce1e228e58597aea388.txtβ€Ž

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/erb_tag_variations_test/test_0011_lt%#=_expression_%gt_with_surrounding_code_369da399a0268bc282a2a4109a8f1292.txtβ€Ž

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/erb_tag_variations_test/test_0011_lt%#=_expression_%gt_with_surrounding_code_80f6fd7febe1da078899c9c64840d042.txtβ€Ž

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/erb_tag_variations_test/test_0023_mixed_commented_and_active_tags_1a902724c9628f99da96c6bc93d07bbf.txtβ€Ž

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/erb_tag_variations_test/test_0023_mixed_commented_and_active_tags_42bad862846e13d9971b88af54358ad2.txtβ€Ž

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtest/snapshots/engine/erb_tag_variations_test/test_0024_all_commented_tag_variations_39e31bc6fc1648dae60dee59a0b5d08d.txtβ€Ž

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)