Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
refactor: added missing irregular verbs (#2187)
Andrew Dunbardde4920ff720
diff --git a/harper-core/src/linting/simple_past_to_past_participle.rs b/harper-core/src/linting/simple_past_to_past_participle.rsindex 66c519c9a..f2b4eed8e 100644--- a/harper-core/src/linting/simple_past_to_past_participle.rs+++ b/harper-core/src/linting/simple_past_to_past_participle.rs@@ -2,7 +2,7 @@ use crate::{Token,char_string::CharStringExt,expr::{All, Expr, SequenceExpr},- linting::{ExprLinter, Lint, LintKind, Suggestion, expr_linter::find_the_only_token_matching},+ linting::{ExprLinter, Lint, LintKind, Suggestion},patterns::{InflectionOfBe, WordSet},};@@ -16,35 +16,56 @@ const IRREGULAR_VERBS: &[(&str, &str)] = &[("began", "begun"),("bit", "bitten"),("blew", "blown"),+ ("bought", "bought"),+ ("brang", "brung"),("broke", "broken"),+ ("brought", "brought"),("came", "come"),("chose", "chosen"),("did", "done"),("drank", "drunk"),("drove", "driven"),("fell", "fallen"),+ ("felt", "felt"),("flew", "flown"),("forgot", "forgotten"),("forwent", "forgone"),("gave", "given"),+ ("grew", "grown"),+ ("had", "had"),+ ("heard", "heard"),+ ("hit", "hit"),+ ("input", "input"),("knew", "known"),+ ("led", "led"),("mistook", "mistaken"),+ ("output", "output"),("overtook", "overtaken"),+ ("paid", "paid"),("partook", "partaken"),// proved, proved/proven+ ("put", "put"),("ran", "run"),("rang", "rung"),+ ("read", "read"),+ ("reset", "reset"),("rode", "ridden"),("rose", "risen"),("sang", "sung"),("sank", "sunken"),("saw", "seen"),+ ("set", "set"),("sewed", "sewn"),("slew", "slain"),+ ("slid", "slid"),("spoke", "spoken"),+ ("sprang", "sprung"),("stank", "stunk"),("stole", "stolen"),+ ("stood", "stood"),("swam", "swum"),+ ("swore", "sworn"),+ ("thought", "thought"),("trod", "trodden"),("took", "taken"),// was, been@@ -96,13 +117,23 @@ impl ExprLinter for SimplePastToPastParticiple {}fn match_to_lint(&self, toks: &[Token], src: &[char]) -> Option<Lint> {- let verb_tok = find_the_only_token_matching(toks, src, |tok, src| {- IRREGULAR_VERBS.iter().any(|(simple_past, _)| {- tok.span- .get_content(src)- .eq_ignore_ascii_case_str(simple_past)- })- })?;+ if toks.len() != 3+ || !toks[0].kind.is_verb()+ || !toks[1].kind.is_whitespace()+ || !toks[2].kind.is_verb()+ {+ return None;+ }++ let verb_tok = &toks[2];++ let verb_ch = verb_tok.span.get_content(src);+ if !IRREGULAR_VERBS+ .iter()+ .any(|(t, p)| verb_ch.eq_ignore_ascii_case_str(t) && p != t)+ {+ return None;+ }let (simple_past, past_participle) = IRREGULAR_VERBS.iter()@@ -141,7 +172,9 @@ impl ExprLinter for SimplePastToPastParticiple {#[cfg(test)]mod tests {use super::SimplePastToPastParticiple;- use crate::linting::tests::{assert_no_lints, assert_suggestion_result};+ use crate::linting::tests::{+ assert_no_lints, assert_suggestion_result, assert_top3_suggestion_result,+ };#[test]fn correct_have_went() {@@ -154,7 +187,7 @@ mod tests {#[test]fn correct_had_went() {- assert_suggestion_result(+ assert_top3_suggestion_result("Not sure if TroLoos had went from Tasmota->minimal->Tasmota, or directly Minimal->Tasmota, but going ESPHome->Minimal->Tasmota is not possible",SimplePastToPastParticiple::default(),"Not sure if TroLoos had gone from Tasmota->minimal->Tasmota, or directly Minimal->Tasmota, but going ESPHome->Minimal->Tasmota is not possible",@@ -235,7 +268,7 @@ mod tests {#[test]fn correct_had_began() {- assert_suggestion_result(+ assert_top3_suggestion_result("I had began learning Android App development since Aug 2021",SimplePastToPastParticiple::default(),"I had begun learning Android App development since Aug 2021",@@ -251,10 +284,9 @@ mod tests {);}- // I have saw that your paper has been accepted by JAIR#[test]fn correct_have_saw() {- assert_suggestion_result(+ assert_top3_suggestion_result("I have saw that your paper has been accepted by JAIR",SimplePastToPastParticiple::default(),"I have seen that your paper has been accepted by JAIR",