Skip to content

perf(formatter): skip propagate the most expanded variant of best_fitting #16626

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

Closed
Dunqing wants to merge 3 commits into from
Closed

perf(formatter): skip propagate the most expanded variant of best_fitting #16626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d6d27
perf(formatter): skip propagate the most expanded variant of best_fit…
Dunqing Dec 9, 2025
fefc7bd
expand
Dunqing Dec 9, 2025
76e0cab
don't cache interned result
Dunqing Dec 9, 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
27 changes: 15 additions & 12 deletions crates/oxc_formatter/src/formatter/format_element/document.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,23 @@ impl Document<'_> {
_ => false,
},
FormatElement::Interned(interned) => {
if let Some(interned_expands) = checked_interned.get(interned) {
*interned_expands
} else {
let interned_expands =
propagate_expands(interned, enclosing, checked_interned);
checked_interned.insert(interned, interned_expands);
interned_expands
}
// if let Some(interned_expands) = checked_interned.get(interned) {
// *interned_expands
// } else {
let interned_expands =
propagate_expands(interned, enclosing, checked_interned);
checked_interned.insert(interned, interned_expands);
interned_expands
// }
}
FormatElement::BestFitting(best_fitting) => {
enclosing.push(Enclosing::BestFitting);

for variant in best_fitting.variants() {
propagate_expands(variant, enclosing, checked_interned);
let mut expanded = true;
for variant in best_fitting.non_expanded_variants() {
let res = propagate_expands(variant, enclosing, checked_interned);
if expanded {
expanded = res;
}
}

enclosing.pop();
Expand Down Expand Up @@ -110,7 +113,7 @@ impl Document<'_> {
// Instead, just returning false here enforces that `best_fitting` doesn't
// think it expands _itself_, but allows other sibling elements to still
// propagate their expansion.
false
expanded
}
// `FormatElement::Token` cannot contain line breaks
FormatElement::Text { text: _, width } => width.is_multiline(),
Expand Down
4 changes: 4 additions & 0 deletions crates/oxc_formatter/src/formatter/format_element/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ impl<'a> BestFittingElement<'a> {
self.variants
}

pub fn non_expanded_variants(&self) -> &[&'a [FormatElement<'a>]] {
&self.variants[..self.variants.len() - 1]
}

/// Returns the least expanded variant
pub fn most_flat(&self) -> &[FormatElement<'a>] {
self.variants.first().expect(
Expand Down
Loading