Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
More irregular verbs for 'have went' linter (#1973)
Andrew Dunbarc604c67a12d0
diff --git a/harper-core/dictionary.dict b/harper-core/dictionary.dictindex 1672750da..1492968a0 100644--- a/harper-core/dictionary.dict+++ b/harper-core/dictionary.dict@@ -52467,7 +52467,7 @@ wrongful/~JYpwrongfulness/Nmgwrongheaded/JYpwrongheadedness/Ng-wrongness/Nmg+wrongness/Ngwrote/~Vtrwroth/Jwrought/~JVdiff --git a/harper-core/src/expr/sequence_expr.rs b/harper-core/src/expr/sequence_expr.rsindex 722c5d2b4..e9f8a2478 100644--- a/harper-core/src/expr/sequence_expr.rs+++ b/harper-core/src/expr/sequence_expr.rs@@ -427,6 +427,8 @@ impl SequenceExpr {gen_then_from_is!(auxiliary_verb);gen_then_from_is!(linking_verb);gen_then_from_is!(verb_lemma);+ gen_then_from_is!(verb_simple_past_form);+ gen_then_from_is!(verb_past_participle_form);// Adjectivesdiff --git a/harper-core/src/linting/simple_past_to_past_participle.rs b/harper-core/src/linting/simple_past_to_past_participle.rsindex 2d6b5a141..66c519c9a 100644--- a/harper-core/src/linting/simple_past_to_past_participle.rs+++ b/harper-core/src/linting/simple_past_to_past_participle.rs@@ -8,28 +8,50 @@ use crate::{/// Maps common irregular verbs between their simple past and past participle forms.const IRREGULAR_VERBS: &[(&str, &str)] = &[+ ("arose", "arisen"),("ate", "eaten"),+ ("awoke", "awoken"),+ ("bade", "bidden"),("became", "become"),("began", "begun"),+ ("bit", "bitten"),+ ("blew", "blown"),("broke", "broken"),("came", "come"),+ ("chose", "chosen"),("did", "done"),("drank", "drunk"),("drove", "driven"),("fell", "fallen"),("flew", "flown"),+ ("forgot", "forgotten"),+ ("forwent", "forgone"),("gave", "given"),("knew", "known"),+ ("mistook", "mistaken"),+ ("overtook", "overtaken"),+ ("partook", "partaken"),+ // proved, proved/proven+ ("ran", "run"),+ ("rang", "rung"),+ ("rode", "ridden"),+ ("rose", "risen"),("sang", "sung"),("sank", "sunken"),("saw", "seen"),+ ("sewed", "sewn"),+ ("slew", "slain"),("spoke", "spoken"),("stank", "stunk"),("stole", "stolen"),("swam", "swum"),+ ("trod", "trodden"),("took", "taken"),+ // was, been+ // were, been("went", "gone"),("woke", "woken"),+ ("wove", "woven"),("wrote", "written"),];@@ -40,11 +62,6 @@ pub struct SimplePastToPastParticiple {impl Default for SimplePastToPastParticiple {fn default() -> Self {- let mut simple_past_forms_word_set = WordSet::default();- for (simple_past, _) in IRREGULAR_VERBS {- simple_past_forms_word_set.add(simple_past);- }-Self {expr: Box::new(All::new(vec![// positive: the general case@@ -57,7 +74,7 @@ impl Default for SimplePastToPastParticiple {Box::new(InflectionOfBe::default()),]).t_ws()- .then(simple_past_forms_word_set),+ .then_verb_simple_past_form(),),// negative: one known exceptionBox::new(diff --git a/harper-core/src/token_kind.rs b/harper-core/src/token_kind.rsindex 2f23145e4..068a4812e 100644--- a/harper-core/src/token_kind.rs+++ b/harper-core/src/token_kind.rs@@ -94,6 +94,7 @@ impl TokenKind {is_linking_verb,is_verb_lemma,is_verb_simple_past_form,+ is_verb_past_participle_form,is_verb_progressive_form,is_verb_third_person_singular_present_form,