actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2025-01-10 08:44:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(cli): Make .in stripping work with non-UTF-8 filenames

Browse source
This commit is contained in:
Ville Skyttä 2023-05-25 16:55:11 +03:00
parent 9c74d015f3
commit d6ac36f057
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
use std::collections::BTreeMap;
use std::path::Path;
use kstring::KString;
@ -107,14 +108,23 @@ impl Types {
}
pub fn file_matched(&self, path: &std::path::Path) -> Option<&str> {
let mut file_name = path.file_name()?.to_str()?;
let mut mpath = Path::new(path);
let mut matches = self.matches.get_or_default().borrow_mut();
loop {
self.set.matches_into(file_name, &mut *matches);
if !matches.is_empty() || !file_name.ends_with(".in") {
self.set.matches_into(mpath.file_name()?, &mut *matches);
if !matches.is_empty() {
break;
}
file_name = file_name.strip_suffix(".in")?;
match mpath.extension() {
None => break,
Some(ext) => {
if ext == "in" {
mpath = Path::new(mpath.file_stem()?);
continue;
}
}
}
break;
}
matches
.last()