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

Merge pull request #761 from epage/rust

Browse source 
fix(config): Always apply type defaults
This commit is contained in:
Ed Page 2023-06-22 10:12:44 -05:00 committed by GitHub
commit 7cce285602
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 113 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

178
crates/typos-cli/src/config.rs
View file

@ -1,5 +1,7 @@
use std::collections::HashMap;
use kstring::KString;
#[derive(Debug, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
#[serde(default)]
@ -148,15 +150,99 @@ impl Walk {
#[serde(default)]
#[serde(transparent)]
pub struct TypeEngineConfig {
pub patterns: std::collections::HashMap<kstring::KString, GlobEngineConfig>,
pub patterns: std::collections::HashMap<KString, GlobEngineConfig>,
}
impl TypeEngineConfig {
pub fn from_defaults() -> Self {
let empty = Self::default();
Self {
patterns: empty.patterns().collect(),
}
let patterns = [
(
KString::from("lock"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
check_file: Some(false),
..Default::default()
},
},
),
(
KString::from("vim"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"windo".into() => "windo".into(),
},
..Default::default()
}),
..Default::default()
},
},
),
(
KString::from("vimscript"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"windo".into() => "windo".into(),
},
..Default::default()
}),
..Default::default()
},
},
),
(
KString::from("rust"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"flate2".into() => "flate2".into(),
},
extend_words: maplit::hashmap! {
"ser".into() => "ser".into(),
},
..Default::default()
}),
..Default::default()
},
},
),
(
KString::from("py"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"NDArray".into() => "NDArray".into(),
},
..Default::default()
}),
..Default::default()
},
},
),
(
KString::from("cert"),
GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
check_file: Some(false),
..Default::default()
},
},
),
]
.into_iter()
.collect();
Self { patterns }
}
pub fn update(&mut self, source: &Self) {
@ -169,85 +255,9 @@ impl TypeEngineConfig {
}
pub fn patterns(&self) -> impl Iterator<Item = (kstring::KString, GlobEngineConfig)> {
let mut patterns = self.patterns.clone();
patterns
.entry("lock".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
check_file: Some(false),
..Default::default()
},
});
patterns
.entry("vim".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"windo".into() => "windo".into(),
},
..Default::default()
}),
..Default::default()
},
});
patterns
.entry("vimscript".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"windo".into() => "windo".into(),
},
..Default::default()
}),
..Default::default()
},
});
patterns
.entry("rust".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"flate2".into() => "flate2".into(),
},
extend_words: maplit::hashmap! {
"ser".into() => "ser".into(),
},
..Default::default()
}),
..Default::default()
},
});
patterns
.entry("py".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
dict: Some(DictConfig {
extend_identifiers: maplit::hashmap! {
"NDArray".into() => "NDArray".into(),
},
..Default::default()
}),
..Default::default()
},
});
patterns
.entry("cert".into())
.or_insert_with(|| GlobEngineConfig {
extend_glob: Vec::new(),
engine: EngineConfig {
check_file: Some(false),
..Default::default()
},
});
patterns.into_iter()
let mut engine = Self::from_defaults();
engine.update(self);
engine.patterns.into_iter()
}
}

10
crates/typos-cli/tests/cmd/extend-builtin-dict.in/_typos.toml Normal file
View file

@ -0,0 +1,10 @@
[type.rust]
check-filename = false
[default.extend-words]
foo = "bar"
[files]
extend-exclude = [
"_typos.toml"
]

1
crates/typos-cli/tests/cmd/extend-builtin-dict.in/foo.rs Normal file
View file

@ -0,0 +1 @@
flate2

8
crates/typos-cli/tests/cmd/extend-builtin-dict.toml Normal file
View file

@ -0,0 +1,8 @@
bin.name = "typos"
args = ""
stdin = '''
\n\n
Destory
'''
stdout = ""
stderr = ""