Skip to content

refactor(formatter): remove format_only_if_breaks and FormatOnlyIfBreaks #16478

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

Merged
graphite-app merged 1 commit into from
Dec 4, 2025
Merged

refactor(formatter): remove format_only_if_breaks and FormatOnlyIfBreaks #16478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 1 addition & 44 deletions crates/oxc_formatter/src/formatter/trivia.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ use oxc_span::Span;

use crate::write;

use super::{Argument, GroupId, SourceText, prelude::*};
use super::{SourceText, prelude::*};

/// Returns true if:
/// - `next_comment` is Some, and
Expand Down Expand Up @@ -425,49 +425,6 @@ impl<'a> Format<'a> for FormatDanglingComments<'a> {
}
}

/// Formats the given token only if the group does break and otherwise retains the token's skipped token trivia.
#[expect(unused)]
pub fn format_only_if_breaks<'content, 'ast, Content>(
span: Span,
content: &'content Content,
) -> FormatOnlyIfBreaks<'content, 'ast>
where
Content: Format<'ast>,
{
FormatOnlyIfBreaks { span, content: Argument::new(content), group_id: None }
}

/// Formats a token with its skipped token trivia that only gets printed if its enclosing
/// group does break but otherwise gets omitted from the formatted output.
pub struct FormatOnlyIfBreaks<'content, 'ast> {
#[expect(unused)]
span: Span,
content: Argument<'content, 'ast>,
group_id: Option<GroupId>,
}

impl FormatOnlyIfBreaks<'_, '_> {
#[expect(unused)]
pub fn with_group_id(mut self, group_id: Option<GroupId>) -> Self {
self.group_id = group_id;
self
}
}

impl<'ast> Format<'ast> for FormatOnlyIfBreaks<'_, 'ast> {
fn fmt(&self, f: &mut Formatter<'_, 'ast>) {
write!(f, if_group_breaks(&self.content).with_group_id(self.group_id));
// TODO: unsupported yet
// if f.comments().has_skipped(self.span) {
// // Print the trivia otherwise
// write!(
// f,
// if_group_fits_on_line(&format_skipped_token_trivia(self.span))
// .with_group_id(self.group_id)
// );
// }
}
}
impl<'a> Format<'a> for Comment {
#[expect(clippy::cast_possible_truncation)]
fn fmt(&self, f: &mut Formatter<'_, 'a>) {
Expand Down
Loading