Skip to content

Commit

Permalink
fix(cli): Respect force-exclude for simple exclude pattersn
Browse files Browse the repository at this point in the history
Fixes #868
  • Loading branch information
epage committed Nov 6, 2023
1 parent edfb79f commit e24c694
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
12 changes: 9 additions & 3 deletions crates/typos-cli/src/bin/typos-cli/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fn run_checks(args: &args::Args) -> proc_exit::ExitResult {
};

// Note: file_list and args.path are mutually exclusive, enforced by clap
for path in file_list.as_ref().unwrap_or(&args.path) {
'path: for path in file_list.as_ref().unwrap_or(&args.path) {
// Note paths are passed through stdin, `-` is treated like a normal path
let cwd = if path == std::path::Path::new("-") {
if args.file_list.is_some() {
Expand Down Expand Up @@ -244,8 +244,14 @@ fn run_checks(args: &args::Args) -> proc_exit::ExitResult {
.build()
.with_code(proc_exit::sysexits::CONFIG_ERR)?;
if args.force_exclude {
if let ignore::Match::Ignore(_) = overrides.matched(path, path.is_dir()) {
continue;
let mut ancestors = path.ancestors().collect::<Vec<_>>();
ancestors.reverse();
for path in ancestors {
match overrides.matched(path, path.is_dir()) {
ignore::Match::None => {}
ignore::Match::Ignore(_) => continue 'path,
ignore::Match::Whitelist(_) => break,
}
}
}
walk.overrides(overrides);
Expand Down
16 changes: 1 addition & 15 deletions crates/typos-cli/tests/cmd/force-exclude.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
bin.name = "typos"
args = "file.ignore ignore/file parent/ignore/file --force-exclude"
stdin = ""
stdout = """
error: `hello` should be `goodbye`
--> ignore/file:1:1
|
1 | hello
| ^^^^^
|
error: `hello` should be `goodbye`
--> parent/ignore/file:1:1
|
1 | hello
| ^^^^^
|
"""
stdout = ""
stderr = ""
status.code = 2

0 comments on commit e24c694

Please sign in to comment.