Skip to content

Commit 38b7bc4

Browse files
committed
fix(oxfmt): Make no-napi build work (#16134)
Required fix for #15985
1 parent 889d2e7 commit 38b7bc4

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

apps/oxfmt/src/service.rs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,22 @@ impl FormatService {
9393
}
9494

9595
let base_formatter = Formatter::new(&allocator, self.format_options.clone());
96-
let formatted = if cfg!(not(feature = "napi"))
97-
|| self.format_options.embedded_language_formatting.is_off()
98-
|| self.external_formatter.is_none()
99-
{
100-
base_formatter.format(&ret.program)
101-
} else {
102-
#[cfg(feature = "napi")]
103-
{
104-
let Some(external_formatter) = &self.external_formatter else {
105-
unreachable!("Already checked above that external_formatter is Some");
106-
};
107-
let embedded_formatter = external_formatter.to_embedded_formatter();
96+
97+
#[cfg(feature = "napi")]
98+
let formatted = {
99+
if self.format_options.embedded_language_formatting.is_off() {
100+
base_formatter.format(&ret.program)
101+
} else {
102+
let embedded_formatter = self
103+
.external_formatter
104+
.as_ref()
105+
.expect("`external_formatter` must exist when `napi` feature is enabled")
106+
.to_embedded_formatter();
108107
base_formatter.format_with_embedded(&ret.program, embedded_formatter)
109108
}
110109
};
110+
#[cfg(not(feature = "napi"))]
111+
let formatted = base_formatter.format(&ret.program);
111112

112113
let code = match formatted.print() {
113114
Ok(printed) => printed.into_code(),

0 commit comments

Comments
 (0)