actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-12-01 05:20:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #247 from epage/search

Browse source 
fix(cli): Discover config in parent dirs
This commit is contained in:
Ed Page 2021-05-14 18:55:13 -05:00 committed by GitHub
commit 7c6b85c442
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config.rs
View file

@ -17,6 +17,7 @@ impl Config {
let config = if let Some(path) = let config = if let Some(path) =
find_project_file(cwd, &["typos.toml", "_typos.toml", ".typos.toml"]) find_project_file(cwd, &["typos.toml", "_typos.toml", ".typos.toml"])
{ {
log::debug!("Loading {}", path.display());
Some(Self::from_file(&path)?) Some(Self::from_file(&path)?)
} else { } else {
None None

7
src/policy.rs
View file

@ -123,8 +123,11 @@ impl<'s> ConfigEngine<'s> {
let mut config = crate::config::Config::default(); let mut config = crate::config::Config::default();
if !self.isolated { if !self.isolated {
if let Some(derived) = crate::config::Config::from_dir(cwd)? { for ancestor in cwd.ancestors() {
config.update(&derived); if let Some(derived) = crate::config::Config::from_dir(ancestor)? {
config.update(&derived);
break;
}
} }
} }
if let Some(overrides) = self.overrides.as_ref() { if let Some(overrides) = self.overrides.as_ref() {