Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat: more bigger→bigger, most best→best (#2148)

Andrew Dunbarf465bec169ca
diff --git a/harper-core/src/linting/lint_group.rs b/harper-core/src/linting/lint_group.rs
index d65009c34..d38af5524 100644
--- a/harper-core/src/linting/lint_group.rs
+++ b/harper-core/src/linting/lint_group.rs
@@ -89,6 +89,7 @@ use super::mixed_bag::MixedBag;
use super::modal_of::ModalOf;
use super::modal_seem::ModalSeem;
use super::months::Months;
+use super::more_better::MoreBetter;
use super::most_number::MostNumber;
use super::most_of_the_times::MostOfTheTimes;
use super::multiple_sequential_pronouns::MultipleSequentialPronouns;
@@ -463,14 +464,13 @@ impl LintGroup {
insert_expr_rule!(BackInTheDay, true);
insert_expr_rule!(BeAllowed, true);
insert_expr_rule!(BestOfAllTime, true);
- insert_expr_rule!(Bought, true);
insert_expr_rule!(BoringWords, false);
+ insert_expr_rule!(Bought, true);
insert_expr_rule!(Cant, true);
insert_struct_rule!(CapitalizePersonalPronouns, true);
insert_expr_rule!(CautionaryTale, true);
insert_expr_rule!(ChangeTack, true);
insert_expr_rule!(ChockFull, true);
- insert_struct_rule!(OrthographicConsistency, true);
insert_struct_rule!(CommaFixes, true);
insert_struct_rule!(CompoundNouns, true);
insert_expr_rule!(CompoundSubjectI, true);
@@ -517,14 +517,14 @@ impl LintGroup {
insert_struct_rule!(LongSentences, true);
insert_expr_rule!(LookingForwardTo, true);
insert_struct_rule!(MergeWords, true);
- insert_expr_rule!(SplitWords, true);
- insert_expr_rule!(Misspell, true);
insert_expr_rule!(MissingPreposition, true);
insert_expr_rule!(MissingTo, true);
+ insert_expr_rule!(Misspell, true);
insert_expr_rule!(MixedBag, true);
insert_expr_rule!(ModalOf, true);
insert_expr_rule!(ModalSeem, true);
insert_expr_rule!(Months, true);
+ insert_expr_rule!(MoreBetter, true);
insert_expr_rule!(MostNumber, true);
insert_expr_rule!(MostOfTheTimes, true);
insert_expr_rule!(MultipleSequentialPronouns, true);
@@ -534,8 +534,8 @@ impl LintGroup {
insert_struct_rule!(NoOxfordComma, false);
insert_expr_rule!(Nobody, true);
insert_struct_rule!(NominalWants, true);
- insert_struct_rule!(NounVerbConfusion, true);
insert_expr_rule!(NounCountability, true);
+ insert_struct_rule!(NounVerbConfusion, true);
insert_struct_rule!(NumberSuffixCapitalization, true);
insert_struct_rule!(OfCourse, true);
insert_expr_rule!(OnFloor, true);
@@ -543,6 +543,7 @@ impl LintGroup {
insert_expr_rule!(OneAndTheSame, true);
insert_expr_rule!(OpenCompounds, true);
insert_expr_rule!(OpenTheLight, true);
+ insert_struct_rule!(OrthographicConsistency, true);
insert_struct_rule!(OughtToBe, true);
insert_expr_rule!(OutOfDate, true);
insert_struct_rule!(OxfordComma, true);
@@ -567,18 +568,19 @@ impl LintGroup {
insert_expr_rule!(ShootOneselfInTheFoot, true);
insert_expr_rule!(SimplePastToPastParticiple, true);
insert_expr_rule!(SinceDuration, true);
+ insert_expr_rule!(SomeWithoutArticle, true);
insert_expr_rule!(SomethingIs, true);
insert_expr_rule!(SomewhatSomething, true);
insert_expr_rule!(SoughtAfter, true);
- insert_expr_rule!(SomeWithoutArticle, true);
insert_struct_rule!(Spaces, true);
insert_struct_rule!(SpelledNumbers, false);
+ insert_expr_rule!(SplitWords, true);
insert_expr_rule!(ThatThan, true);
insert_expr_rule!(ThatWhich, true);
insert_expr_rule!(TheHowWhy, true);
insert_struct_rule!(TheMy, true);
- insert_expr_rule!(Theres, true);
insert_expr_rule!(ThenThan, true);
+ insert_expr_rule!(Theres, true);
insert_expr_rule!(ThingThink, true);
insert_expr_rule!(ThoughThought, true);
insert_expr_rule!(ThrowAway, true);
@@ -589,8 +591,8 @@ impl LintGroup {
insert_struct_rule!(UnclosedQuotes, true);
insert_expr_rule!(UpdatePlaceNames, true);
insert_expr_rule!(UseGenitive, false);
- insert_expr_rule!(ViceVersa, true);
insert_expr_rule!(VeryUnique, true);
+ insert_expr_rule!(ViceVersa, true);
insert_expr_rule!(WasAloud, true);
insert_expr_rule!(WayTooAdjective, true);
insert_expr_rule!(WellEducated, true);
diff --git a/harper-core/src/linting/mod.rs b/harper-core/src/linting/mod.rs
index 6bafe41b1..571a2f205 100644
--- a/harper-core/src/linting/mod.rs
+++ b/harper-core/src/linting/mod.rs
@@ -96,6 +96,7 @@ mod mixed_bag;
mod modal_of;
mod modal_seem;
mod months;
+mod more_better;
mod most_number;
mod most_of_the_times;
mod multiple_sequential_pronouns;
@@ -267,6 +268,7 @@ pub use mixed_bag::MixedBag;
pub use modal_of::ModalOf;
pub use modal_seem::ModalSeem;
pub use months::Months;
+pub use more_better::MoreBetter;
pub use most_number::MostNumber;
pub use most_of_the_times::MostOfTheTimes;
pub use multiple_sequential_pronouns::MultipleSequentialPronouns;
diff --git a/harper-core/src/linting/more_better.rs b/harper-core/src/linting/more_better.rs
new file mode 100644
index 000000000..8672b8ac6
--- /dev/null
+++ b/harper-core/src/linting/more_better.rs
@@ -0,0 +1,89 @@
+use crate::expr::{Expr, SequenceExpr};
+use crate::linting::{ExprLinter, Lint, LintKind, Suggestion};
+use crate::token::Token;
+use crate::token_string_ext::TokenStringExt;
+
+pub struct MoreBetter {
+ expr: Box<dyn Expr>,
+}
+
+impl Default for MoreBetter {
+ fn default() -> Self {
+ Self {
+ expr: Box::new(SequenceExpr::any_of(vec![
+ Box::new(
+ SequenceExpr::default()
+ .t_aco("more")
+ .t_ws()
+ .then_comparative_adjective(),
+ ),
+ Box::new(
+ SequenceExpr::default()
+ .t_aco("most")
+ .t_ws()
+ .then_superlative_adjective(),
+ ),
+ ])),
+ }
+ }
+}
+
+impl ExprLinter for MoreBetter {
+ fn expr(&self) -> &dyn Expr {
+ self.expr.as_ref()
+ }
+
+ fn match_to_lint(&self, toks: &[Token], src: &[char]) -> Option<Lint> {
+ let phrase_span = toks.span()?;
+
+ let degree_str = toks.first()?.span.get_content_string(src);
+ let adj_span = toks.last()?.span;
+
+ let suggestion = Suggestion::replace_with_match_case(
+ adj_span.get_content(src).to_vec(),
+ phrase_span.get_content(src),
+ );
+
+ let message = format!(
+ "{} is already in the {} form, the {} is redundant",
+ adj_span.get_content_string(src),
+ if degree_str.eq_ignore_ascii_case("more") {
+ "comparative"
+ } else {
+ "superlative"
+ },
+ degree_str,
+ );
+
+ Some(Lint {
+ span: phrase_span,
+ lint_kind: LintKind::Redundancy,
+ suggestions: vec![suggestion],
+ message,
+ ..Default::default()
+ })
+ }
+
+ fn description(&self) -> &'static str {
+ "Finds redundant paring of `more` or `most` with adjectives already in the comparative or superlative form."
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use crate::linting::{MoreBetter, tests::assert_suggestion_result};
+
+ #[test]
+ fn flag_most_biggest() {
+ assert_suggestion_result("Most biggest", MoreBetter::default(), "Biggest");
+ }
+
+ #[test]
+ fn flag_more_better_and_more_better() {
+ assert_suggestion_result(
+ "More bigger is more better",
+ MoreBetter::default(),
+ "Bigger is better",
+ );
+ }
+}