Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions crates/oxc_formatter/src/formatter/format_element/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,14 @@ impl<'a> BestFittingElement<'a> {
)
}

/// Splits the variants into the most expanded and the remaining flat variants
pub fn split_to_most_expanded_and_flat_variants(
&self,
) -> (&&[FormatElement<'a>], &[&[FormatElement<'a>]]) {
// SAFETY: We have already asserted that there are at least two variants for creating this struct.
unsafe { self.variants.split_last().unwrap_unchecked() }
}

pub fn variants(&self) -> &[&'a [FormatElement<'a>]] {
self.variants
}
Expand Down
6 changes: 4 additions & 2 deletions crates/oxc_formatter/src/formatter/printer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,10 @@ impl<'a> Printer<'a> {
} else {
self.state.measured_group_fits = true;

for variant in best_fitting.variants() {
let (most_expanded, remaining_variants) =
best_fitting.split_to_most_expanded_and_flat_variants();

for variant in remaining_variants {
// Test if this variant fits and if so, use it. Otherwise try the next
// variant.

Expand Down Expand Up @@ -365,7 +368,6 @@ impl<'a> Printer<'a> {
}

// No variant fits, take the last (most expanded) as fallback
let most_expanded = best_fitting.most_expanded();
queue.extend_back(most_expanded);
self.print_entry(queue, stack, indent_stack, args.with_print_mode(PrintMode::Expanded))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ const defaultColorDecoratorsEnablement = accessor
------------------
const defaultColorDecoratorsEnablement = accessor
.get(IConfigurationService)
.getValue<
"auto" | "always" | "never"
>("longlonglonglonglonglonglonglonglong");
.getValue<"auto" | "always" | "never">(
"longlonglonglonglonglonglonglonglong",
);

-------------------
{ printWidth: 100 }
Expand Down
Loading