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

feat(cli): Strip .in suffix(es) only on non-match

Browse source 
Makes user assigned `.in` work.
This commit is contained in:
Ville Skyttä 2023-05-25 15:13:23 +03:00
parent 90d4676dd7
commit 9c74d015f3
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/typos-cli/src/file_type.rs
View file

@ -107,9 +107,15 @@ impl Types {
} }
pub fn file_matched(&self, path: &std::path::Path) -> Option<&str> { pub fn file_matched(&self, path: &std::path::Path) -> Option<&str> {
let file_name = path.file_name()?.to_str()?.trim_end_matches(".in"); let mut file_name = path.file_name()?.to_str()?;
let mut matches = self.matches.get_or_default().borrow_mut(); let mut matches = self.matches.get_or_default().borrow_mut();
self.set.matches_into(file_name, &mut *matches); loop {
self.set.matches_into(file_name, &mut *matches);
if !matches.is_empty() || !file_name.ends_with(".in") {
break;
}
file_name = file_name.strip_suffix(".in")?;
}
matches matches
.last() .last()
.copied() .copied()
@ -145,16 +151,22 @@ mod tests {
("js", &["*.js"]), ("js", &["*.js"]),
("json", &["*.json"]), ("json", &["*.json"]),
("lock", &["package-lock.json", "*.lock"]), ("lock", &["package-lock.json", "*.lock"]),
("js-in", &["*.js.in"]),
] ]
} }
fn in_types() -> &'static [(&'static str, &'static [&'static str])] {
&[("html", &["*.html", "*.htm"]), ("in-canary", &["*.in"])]
}
matched!(basic_match, types(), "leftpad.js", "js"); matched!(basic_match, types(), "leftpad.js", "js");
matched!(multi_def_1, types(), "index.html", "html"); matched!(multi_def_1, types(), "index.html", "html");
matched!(multi_def_2, types(), "index.htm", "html"); matched!(multi_def_2, types(), "index.htm", "html");
matched!(no_match, types(), "leftpad.ada", None); matched!(no_match, types(), "leftpad.ada", None);
matched!(more_specific, types(), "package-lock.json", "lock"); matched!(more_specific, types(), "package-lock.json", "lock");
matched!(trailing_in, types(), "index.html.in", "html"); matched!(basic_in, types(), "index.html.in", "html");
matched!(trailing_in_in, types(), "index.html.in.in", "html"); matched!(basic_in_in, types(), "index.html.in.in", "html");
matched!(ext_plus_in, types(), "foo.js.in", "js-in");
matched!(toplevel_in, in_types(), "index.html.in", "in-canary");
macro_rules! sort { macro_rules! sort {
($name:ident, $actual:expr, $expected:expr) => { ($name:ident, $actual:expr, $expected:expr) => {