actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-25 18:41:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #869 from epage/exclude

Browse source 
fix(cli): Respect force-exclude for simple exclude patterns
This commit is contained in:
Ed Page 2023-11-06 11:54:57 -06:00 committed by GitHub
commit f01cfa581c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/typos-cli/src/bin/typos-cli/main.rs
View file

@ -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() {
@ -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);

2
crates/typos-cli/tests/cmd/force-exclude.in/_typos.toml
View file

@ -1,5 +1,5 @@
[files]
extend-exclude = ["file.ignore"]
extend-exclude = ["file.ignore", "ignore"]
[default.extend-identifiers]
hello = "goodbye"

1
crates/typos-cli/tests/cmd/force-exclude.in/ignore/file Normal file
View file

@ -0,0 +1 @@
hello

1
crates/typos-cli/tests/cmd/force-exclude.in/parent/ignore/file Normal file
View file

@ -0,0 +1 @@
hello

3
crates/typos-cli/tests/cmd/force-exclude.toml
View file

@ -1,6 +1,5 @@
bin.name = "typos"
args = "file.ignore --force-exclude"
args = "file.ignore ignore/file parent/ignore/file --force-exclude"
stdin = ""
stdout = ""
stderr = ""
status.code = 0