Skip to content

refactor(formatter): remove unnecessary handling of program directives #17795

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
Jan 9, 2026
Merged

refactor(formatter): remove unnecessary handling of program directives #17795

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
16 changes: 4 additions & 12 deletions crates/oxc_formatter/src/write/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,17 @@ impl<'a> Format<'a> for AstNode<'a, Vec<'a, Directive<'a>>> {
f.join_nodes_with_hardline().entries(self);

// if next_sibling's first leading_trivia has more than one new_line, we should add an extra empty line at the end of
// JsDirectiveList, for example:
// the last directive, for example:
//```js
// "use strict"; <- first leading new_line
// <- second leading new_line
// function foo() {

//
// }
//```
// so we should keep an extra empty line after JsDirectiveList

let end = if let Some(last_printed_comment) = f.comments().printed_comments().last()
&& last_printed_comment.span.end > last_directive.span.end
{
last_printed_comment.span.end
} else {
last_directive.span.end
};
// so we should keep an extra empty line after the last directive.

let need_extra_empty_line = f.source_text().lines_after(end) > 1;
let need_extra_empty_line = f.source_text().lines_after(last_directive.span.end) > 1;
write!(f, if need_extra_empty_line { empty_line() } else { hard_line_break() });
}
}
Expand Down
Loading