Skip to content

refactor(oxfmt): Limit auto discover oxfmt.config."ts" only #20216

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
Mar 11, 2026
Merged

refactor(oxfmt): Limit auto discover oxfmt.config."ts" only #20216

Show file tree
Hide file tree
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
17 changes: 9 additions & 8 deletions apps/oxfmt/src/core/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,20 @@ use super::{
const JSON_CONFIG_FILES: &[&str] = &[".oxfmtrc.json", ".oxfmtrc.jsonc"];
/// JS/TS config file extensions.
const JS_CONFIG_EXTENSIONS: &[&str] = &["ts", "mts", "cts", "js", "mjs", "cjs"];
/// Oxfmt JS/TS config file prefix.
const OXFMT_JS_CONFIG_PREFIX: &str = "oxfmt.config.";
/// Vite+ config file prefix that may contain Oxfmt config under a `.fmt` field.
const VITE_PLUS_JS_CONFIG_PREFIX: &str = "vite.config.";
/// Oxfmt JS/TS config file name.
/// Only `.ts` extension is supported, matching oxlint's behavior.
const OXFMT_JS_CONFIG_NAME: &str = "oxfmt.config.ts";
/// Vite+ config file name that may contain Oxfmt config under a `.fmt` field.
/// Only `.ts` extension is supported, matching oxlint's behavior.
const VITE_PLUS_CONFIG_NAME: &str = "vite.config.ts";
#[cfg(feature = "napi")]
const VITE_PLUS_OXFMT_CONFIG_FIELD: &str = "fmt";

/// Returns an iterator of all supported config file names, in priority order.
pub fn all_config_file_names() -> impl Iterator<Item = String> {
let json = JSON_CONFIG_FILES.iter().map(|f| (*f).to_string());
let oxfmt_js = JS_CONFIG_EXTENSIONS.iter().map(|ext| format!("{OXFMT_JS_CONFIG_PREFIX}{ext}"));
let vite_plus =
JS_CONFIG_EXTENSIONS.iter().map(|ext| format!("{VITE_PLUS_JS_CONFIG_PREFIX}{ext}"));
let oxfmt_js = std::iter::once(OXFMT_JS_CONFIG_NAME.to_string());
let vite_plus = std::iter::once(VITE_PLUS_CONFIG_NAME.to_string());
json.chain(oxfmt_js).chain(vite_plus)
}

Expand Down Expand Up @@ -273,7 +274,7 @@ impl ConfigResolver {
let is_vite_plus = path
.file_name()
.and_then(|f| f.to_str())
.is_some_and(|name| name.starts_with(VITE_PLUS_JS_CONFIG_PREFIX));
.is_some_and(|name| name == VITE_PLUS_CONFIG_NAME);
let raw_config = if is_vite_plus {
raw_config.get(VITE_PLUS_OXFMT_CONFIG_FIELD).cloned().ok_or_else(|| {
format!("{}\nExpected a `{VITE_PLUS_OXFMT_CONFIG_FIELD}` field in the default export.", path.display())
Expand Down
1 change: 0 additions & 1 deletion apps/oxfmt/src/lsp/server_formatter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ impl Tool for ServerFormatter {
if let Some(config_path) = options.config_path.as_ref().filter(|s| !s.is_empty()) {
vec![config_path.clone()]
} else {
// TODO: This can be glob patterns?
all_config_file_names().collect()
};

Expand Down
36 changes: 2 additions & 34 deletions apps/oxfmt/test/lsp/init/init.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,11 @@ describe("LSP initialization", () => {
it.each([
[
undefined,
[
".oxfmtrc.json",
".oxfmtrc.jsonc",
"oxfmt.config.ts",
"oxfmt.config.mts",
"oxfmt.config.cts",
"oxfmt.config.js",
"oxfmt.config.mjs",
"oxfmt.config.cjs",
"vite.config.ts",
"vite.config.mts",
"vite.config.cts",
"vite.config.js",
"vite.config.mjs",
"vite.config.cjs",
".editorconfig",
],
[".oxfmtrc.json", ".oxfmtrc.jsonc", "oxfmt.config.ts", "vite.config.ts", ".editorconfig"],
],
[
{ "fmt.configPath": "" },
[
".oxfmtrc.json",
".oxfmtrc.jsonc",
"oxfmt.config.ts",
"oxfmt.config.mts",
"oxfmt.config.cts",
"oxfmt.config.js",
"oxfmt.config.mjs",
"oxfmt.config.cjs",
"vite.config.ts",
"vite.config.mts",
"vite.config.cts",
"vite.config.js",
"vite.config.mjs",
"vite.config.cjs",
".editorconfig",
],
[".oxfmtrc.json", ".oxfmtrc.jsonc", "oxfmt.config.ts", "vite.config.ts", ".editorconfig"],
],
[{ "fmt.configPath": "./custom-config.json" }, ["./custom-config.json", ".editorconfig"]],
])(
Expand Down
Loading