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

Merge pull request #798 from epage/refactor

Browse source 
refactor(cli): Abstract away regex ignores
This commit is contained in:
Ed Page 2023-08-08 11:05:09 -05:00 committed by GitHub
commit 6d31a7ef84
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/typos-cli/src/file.rs
View file

@ -47,14 +47,7 @@ impl FileChecker for Typos {
reporter.report(msg.into())?; reporter.report(msg.into())?;
} else { } else {
let mut accum_line_num = AccumulateLineNum::new(); let mut accum_line_num = AccumulateLineNum::new();
let mut ignores: Option<Ignores> = None; for typo in check_bytes(&buffer, policy) {
for typo in typos::check_bytes(&buffer, policy.tokenizer, policy.dict) {
if ignores
.get_or_insert_with(|| Ignores::new(&buffer, policy.ignore))
.is_ignored(typo.span())
{
continue;
}
let line_num = accum_line_num.line_num(&buffer, typo.byte_offset); let line_num = accum_line_num.line_num(&buffer, typo.byte_offset);
let (line, line_offset) = extract_line(&buffer, typo.byte_offset); let (line, line_offset) = extract_line(&buffer, typo.byte_offset);
let msg = report::Typo { let msg = report::Typo {
@ -92,14 +85,7 @@ impl FileChecker for FixTypos {
} else { } else {
let mut fixes = Vec::new(); let mut fixes = Vec::new();
let mut accum_line_num = AccumulateLineNum::new(); let mut accum_line_num = AccumulateLineNum::new();
let mut ignores: Option<Ignores> = None; for typo in check_bytes(&buffer, policy) {
for typo in typos::check_bytes(&buffer, policy.tokenizer, policy.dict) {
if ignores
.get_or_insert_with(|| Ignores::new(&buffer, policy.ignore))
.is_ignored(typo.span())
{
continue;
}
if is_fixable(&typo) { if is_fixable(&typo) {
fixes.push(typo.into_owned()); fixes.push(typo.into_owned());
} else { } else {
@ -176,14 +162,7 @@ impl FileChecker for DiffTypos {
} else { } else {
let mut fixes = Vec::new(); let mut fixes = Vec::new();
let mut accum_line_num = AccumulateLineNum::new(); let mut accum_line_num = AccumulateLineNum::new();
let mut ignores: Option<Ignores> = None; for typo in check_bytes(&buffer, policy) {
for typo in typos::check_bytes(&buffer, policy.tokenizer, policy.dict) {
if ignores
.get_or_insert_with(|| Ignores::new(&buffer, policy.ignore))
.is_ignored(typo.span())
{
continue;
}
if is_fixable(&typo) { if is_fixable(&typo) {
fixes.push(typo.into_owned()); fixes.push(typo.into_owned());
} else { } else {
@ -553,6 +532,19 @@ fn write_file(
Ok(()) Ok(())
} }
fn check_bytes<'a>(
buffer: &'a [u8],
policy: &'a crate::policy::Policy<'a, 'a, 'a>,
) -> impl Iterator<Item = typos::Typo<'a>> {
let mut ignores: Option<Ignores> = None;
typos::check_bytes(buffer, policy.tokenizer, policy.dict).filter(move |typo| {
!ignores
.get_or_insert_with(|| Ignores::new(buffer, policy.ignore))
.is_ignored(typo.span())
})
}
fn report_result<T: Default, E: ToString>( fn report_result<T: Default, E: ToString>(
value: Result<T, E>, value: Result<T, E>,
reporter: &dyn report::Report, reporter: &dyn report::Report,