Merge branch 'main' into linter/issue-20465-vue-js-plugin-ranges

Author: ubugeeei

.github/renovate.json

@@ -11,6 +11,11 @@
       "rangeStrategy": "auto",
       "schedule": ["at any time"],
       "automergeSchedule": ["at any time"]
+    },
+    {
+      "groupName": "emnapi",
+      "matchManagers": ["npm"],
+      "matchPackageNames": ["emnapi", "/^@emnapi\\//"]
     }
   ]
 }

.github/workflows/ci.yml

@@ -462,7 +462,7 @@ jobs:
           cache: rust
       - run: rustup toolchain install "${TOOLCHAIN}" --profile minimal --component rust-docs
       # https://github.com/rust-lang/rust/issues/146895
-      - run: RUSTDOCFLAGS='-D warnings' cargo +"${TOOLCHAIN}" doc --no-deps --document-private-items -Zrustdoc-mergeable-info
+      - run: RUSTDOCFLAGS='-D warnings' cargo +"${TOOLCHAIN}" doc --no-deps --document-private-items --all-features -Zrustdoc-mergeable-info
 
   conformance:
     name: Conformance

apps/oxfmt/src/cli/mod.rs

@@ -4,7 +4,7 @@ mod reporter;
 mod result;
 mod runner;
 mod service;
-mod walk;
+pub(crate) mod walk;
 
 pub use crate::core::utils::init_tracing;
 #[cfg(feature = "napi")]

apps/oxfmt/src/stdin/mod.rs

@@ -4,6 +4,9 @@ use std::{
     path::PathBuf,
 };
 
+use ignore::gitignore::Gitignore;
+
+use crate::cli::walk::resolve_ignore_paths;
 use crate::cli::{CliRunResult, FormatCommand, Mode};
 use crate::core::{
     ConfigResolver, ExternalFormatter, FormatFileStrategy, FormatResult, JsConfigLoaderCb,
@@ -40,7 +43,7 @@ impl StdinRunner {
         let stderr = &mut BufWriter::new(io::stderr());
 
         let cwd = self.cwd;
-        let FormatCommand { mode, config_options, .. } = self.options;
+        let FormatCommand { mode, config_options, ignore_options, .. } = self.options;
 
         let Mode::Stdin(filepath) = mode else {
             unreachable!("`StdinRunner::run()` called with non-Stdin mode");
@@ -98,6 +101,24 @@ impl StdinRunner {
             return CliRunResult::InvalidOptionConfig;
         };
 
+        // Check if the file is ignored by global ignores or config`.ignorePatterns`
+        let resolved_ignore_paths = match resolve_ignore_paths(&cwd, &ignore_options.ignore_path) {
+            Ok(paths) => paths,
+            Err(err) => {
+                utils::print_and_flush(stderr, &format!("{err}\n"));
+                return CliRunResult::InvalidOptionConfig;
+            }
+        };
+        let is_ignored = resolved_ignore_paths.iter().any(|ignore_path| {
+            let (gitignore, _) = Gitignore::new(ignore_path);
+            gitignore.matched_path_or_any_parents(strategy.path(), false).is_ignore()
+        }) || config_resolver.is_path_ignored(strategy.path(), false);
+
+        if is_ignored {
+            utils::print_and_flush(stdout, &source_text);
+            return CliRunResult::FormatSucceeded;
+        }
+
         // Resolve options for the stdin file entry
         let resolved_options = config_resolver.resolve(&strategy);
 

apps/oxfmt/test/cli/stdin_ignore_patterns/0.snap.md

@@ -0,0 +1,32 @@
+# Input
+
+## Command
+```
+oxfmt --stdin-filepath test.ts
+```
+
+## File tree
+```
+- fixtures/ <CWD>
+  - .oxfmtrc.json
+  - .prettierignore
+  - input.ts
+```
+
+# Result
+
+## Exit code
+0
+
+## stdout
+```
+const x: number = 1;
+```
+
+## stderr
+```
+
+```
+
+## File changes
+No changes

apps/oxfmt/test/cli/stdin_ignore_patterns/1.snap.md

@@ -0,0 +1,32 @@
+# Input
+
+## Command
+```
+oxfmt --stdin-filepath ignored/test.ts
+```
+
+## File tree
+```
+- fixtures/ <CWD>
+  - .oxfmtrc.json
+  - .prettierignore
+  - input.ts
+```
+
+# Result
+
+## Exit code
+0
+
+## stdout
+```
+const   x:number=1
+```
+
+## stderr
+```
+
+```
+
+## File changes
+No changes

apps/oxfmt/test/cli/stdin_ignore_patterns/2.snap.md

@@ -0,0 +1,32 @@
+# Input
+
+## Command
+```
+oxfmt --stdin-filepath prettierignored/test.ts
+```
+
+## File tree
+```
+- fixtures/ <CWD>
+  - .oxfmtrc.json
+  - .prettierignore
+  - input.ts
+```
+
+# Result
+
+## Exit code
+0
+
+## stdout
+```
+const   x:number=1
+```
+
+## stderr
+```
+
+```
+
+## File changes
+No changes

apps/oxfmt/test/cli/stdin_ignore_patterns/fixtures/.oxfmtrc.json

@@ -0,0 +1,3 @@
+{
+  "ignorePatterns": ["ignored/"]
+}

apps/oxfmt/test/cli/stdin_ignore_patterns/fixtures/.prettierignore

@@ -0,0 +1 @@
+prettierignored/

apps/oxfmt/test/cli/stdin_ignore_patterns/fixtures/input.ts

@@ -0,0 +1 @@
+const   x:number=1