Skip to content

fix: Preserve single line html #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Preserve single line html #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6135df1
add test cases
isAdrisal Nov 12, 2025
57a8d82
add single line html conditionals
isAdrisal Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/generation/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3053,9 +3053,14 @@ fn maybe_gen_tagged_tpl_with_external_formatter<'a>(node: &TaggedTpl<'a>, contex
}
};

let is_single_line_html = embedded_lang == "html" && !text.contains('\n') && formatted_tpl.trim_end().lines().count() == 1;
let preserve_single_line = is_single_line_html;

let mut items = PrintItems::new();
items.push_sc(sc!("`"));
items.push_signal(Signal::NewLine);
if !preserve_single_line {
items.push_signal(Signal::NewLine);
}
items.push_signal(Signal::StartIndent);
let mut index = 0;
let mut current_indent_level = 0;
Expand Down Expand Up @@ -3091,7 +3096,11 @@ fn maybe_gen_tagged_tpl_with_external_formatter<'a>(node: &TaggedTpl<'a>, contex
index += 1;
}
}
items.push_signal(Signal::NewLine);
if !preserve_single_line {
items.push_signal(Signal::NewLine);
} else {
break;
}
}
while current_indent_level > 0 {
items.push_signal(Signal::FinishIndent);
Expand Down
15 changes: 15 additions & 0 deletions tests/specs/external_formatter/html.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,18 @@ export const Layout = (props: Props) =>
</body>
</html>
`;

== should format single-line html without whitespace in html`...` ==
let htmlStringOne = html`<span>foo</span>`;
let htmlStringTwo = html` <span>foo</span>`;
[expect]
let htmlStringOne = html`<span>foo</span>`;
let htmlStringTwo = html`<span>foo</span>`;

== should format multi-line html with whitespace in html`...` ==
let htmlString = html`
<span>foo</span>`;
[expect]
let htmlString = html`
<span>foo</span>
`;