[autofix.ci] apply automated fixes (attempt 2/3)

Author: autofix-ci[bot]

apps/oxfmt/src/format.rs

@@ -175,7 +175,7 @@ impl FormatRunner {
     }
 }
 
-const DEFAULT_CONFIG_NAMES: &[&str] = &[".oxfmtrc.json", ".oxfmtrc.jsonc"];
+const DEFAULT_OXFMTRC: &str = ".oxfmtrc.json";
 
 /// # Errors
 ///
@@ -185,30 +185,23 @@ const DEFAULT_CONFIG_NAMES: &[&str] = &[".oxfmtrc.json", ".oxfmtrc.jsonc"];
 fn load_config(cwd: &Path, config: Option<&PathBuf>) -> Result<FormatOptions, String> {
     // If `--config` is explicitly specified, use that path directly
     if let Some(config_path) = config {
-        let full_path =
-            if config_path.is_absolute() { config_path.clone() } else { cwd.join(config_path) };
+        let full_path = if config_path.is_absolute() {
+            PathBuf::from(config_path)
+        } else {
+            cwd.join(config_path)
+        };
 
         // This will error if the file does not exist or is invalid
         let oxfmtrc = Oxfmtrc::from_file(&full_path)?;
         return oxfmtrc.into_format_options();
     }
 
     // If `--config` is not specified, search the nearest config file from cwd upwards
-    let mut current_dir = cwd;
-    loop {
-        // Try each config name in order
-        for config_name in DEFAULT_CONFIG_NAMES {
-            let config_path = current_dir.join(config_name);
-            if config_path.exists() {
-                let oxfmtrc = Oxfmtrc::from_file(&config_path)?;
-                return oxfmtrc.into_format_options();
-            }
-        }
-
-        if let Some(parent) = current_dir.parent() {
-            current_dir = parent;
-        } else {
-            break;
+    for dir in cwd.ancestors() {
+        let config_path = dir.join(DEFAULT_OXFMTRC);
+        if config_path.exists() {
+            let oxfmtrc = Oxfmtrc::from_file(&config_path)?;
+            return oxfmtrc.into_format_options();
         }
     }
 

apps/oxfmt/tests/fixtures/config_file/.oxfmtrc.json

@@ -1,3 +1,3 @@
 {
-  "semicorons": false
+  "semicolons": "always"
 }

apps/oxfmt/tests/fixtures/config_file/fmt.json

@@ -1,3 +1,3 @@
 {
-  "semicorons": false
+  "semicolons": "always"
 }

apps/oxfmt/tests/fixtures/config_file/fmt.jsonc

@@ -1,4 +1,4 @@
 {
   // Supports JSONC!
-  "semicorons": false
+  "semicolons": "always"
 }

apps/oxfmt/tests/fixtures/config_file/nested/.oxfmtrc.jsonc

@@ -1,3 +1,3 @@
 {
-  "semicorons": false
+  "semicolons": "always"
 }

apps/oxfmt/tests/mod.rs

@@ -71,7 +71,7 @@ fn config_file_explicit() {
         &[
             &["--check", "--config", "./fmt.json"],
             &["--check", "--config", "./fmt.jsonc"],
-            &[ "--check", "--config", "NOT_EXISTS.json" ],
+            &["--check", "--config", "NOT_EXISTS.json"],
         ],
     );
 }

apps/oxfmt/tests/snapshots/tests__fixtures__config_file_--check --config .__fmt.json --check --config .__fmt.jsonc --check --config NOT_EXISTS.json@oxfmt.snap

@@ -32,7 +32,7 @@ arguments: --check --config NOT_EXISTS.json
 working directory: tests/fixtures/config_file
 ----------
 Failed to load configuration file.
-Failed to read config <cwd>/tests/fixtures/config_file/NOT_EXISTS.json: Os { code: 2, kind: NotFound, message: "No such file or directory" }
+Failed to read config <cwd>/tests/fixtures/config_file/NOT_EXISTS.json: No such file or directory (os error 2)
 ----------
 CLI result: InvalidOptionConfig
 ----------

apps/oxfmt/tests/snapshots/tests__fixtures__config_file__nested_--check@oxfmt.snap

@@ -0,0 +1,15 @@
+---
+source: apps/oxfmt/tests/tester.rs
+---
+########## 
+arguments: --check
+working directory: tests/fixtures/config_file/nested
+----------
+Checking formatting...
+deep/test.js (<variable>ms)
+
+Format issues found in above 1 files. Run without `--check` to fix.
+Finished in <variable>ms on 1 files using 1 threads.
+----------
+CLI result: FormatMismatch
+----------

apps/oxfmt/tests/snapshots/tests__fixtures__config_file__nested__deep_--check@oxfmt.snap

@@ -0,0 +1,15 @@
+---
+source: apps/oxfmt/tests/tester.rs
+---
+########## 
+arguments: --check
+working directory: tests/fixtures/config_file/nested/deep
+----------
+Checking formatting...
+test.js (<variable>ms)
+
+Format issues found in above 1 files. Run without `--check` to fix.
+Finished in <variable>ms on 1 files using 1 threads.
+----------
+CLI result: FormatMismatch
+----------

crates/oxc_formatter/src/service/oxfmtrc.rs

@@ -86,17 +86,17 @@ impl Oxfmtrc {
     pub fn from_file(path: &Path) -> Result<Self, String> {
         // TODO: Use `simdutf8` like `oxc_linter`?
         let mut string = std::fs::read_to_string(path)
-            .map_err(|e| format!("Failed to read config {}: {e:?}", path.display()))?;
+            .map_err(|err| format!("Failed to read config {}: {err}", path.display()))?;
 
         // JSONC support - strip comments
         json_strip_comments::strip(&mut string)
-            .map_err(|e| format!("Failed to strip comments from {}: {e:?}", path.display()))?;
+            .map_err(|err| format!("Failed to strip comments from {}: {err}", path.display()))?;
 
         let json = serde_json::from_str::<serde_json::Value>(&string)
-            .map_err(|e| format!("Failed to parse config {}: {e}", path.display()))?;
+            .map_err(|err| format!("Failed to parse config {}: {err}", path.display()))?;
 
         Self::deserialize(&json)
-            .map_err(|e| format!("Failed to deserialize config {}: {e:?}", path.display()))
+            .map_err(|err| format!("Failed to deserialize config {}: {err}", path.display()))
     }
 
     /// # Errors