Skip to content

fix(oxfmt): Make no-napi build work #16134

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
Nov 26, 2025
Merged

fix(oxfmt): Make no-napi build work #16134

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
25 changes: 13 additions & 12 deletions apps/oxfmt/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,22 @@ impl FormatService {
}

let base_formatter = Formatter::new(&allocator, self.format_options.clone());
let formatted = if cfg!(not(feature = "napi"))
|| self.format_options.embedded_language_formatting.is_off()
|| self.external_formatter.is_none()
{
base_formatter.format(&ret.program)
} else {
#[cfg(feature = "napi")]
{
let Some(external_formatter) = &self.external_formatter else {
unreachable!("Already checked above that external_formatter is Some");
};
let embedded_formatter = external_formatter.to_embedded_formatter();

#[cfg(feature = "napi")]
let formatted = {
if self.format_options.embedded_language_formatting.is_off() {
base_formatter.format(&ret.program)
} else {
let embedded_formatter = self
.external_formatter
.as_ref()
.expect("`external_formatter` must exist when `napi` feature is enabled")
.to_embedded_formatter();
base_formatter.format_with_embedded(&ret.program, embedded_formatter)
}
};
#[cfg(not(feature = "napi"))]
let formatted = base_formatter.format(&ret.program);

let code = match formatted.print() {
Ok(printed) => printed.into_code(),
Expand Down
Loading