Skip to content

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

refactor(core): remove unused argument/member (#3072)

Steve Kurch4ec35dac8237
diff --git a/harper-core/src/linting/lint_group/mod.rs b/harper-core/src/linting/lint_group/mod.rs
index 7ce52c709..55d83c8f9 100644
--- a/harper-core/src/linting/lint_group/mod.rs
+++ b/harper-core/src/linting/lint_group/mod.rs
@@ -493,9 +493,7 @@ impl LintGroup {
out.merge_from(weir_rules::lint_group());
out.merge_from(phrase_set_corrections::lint_group());
- out.merge_from(proper_noun_capitalization_linters::lint_group(
- dictionary.clone(),
- ));
+ out.merge_from(proper_noun_capitalization_linters::lint_group());
out.merge_from(closed_compounds::lint_group());
out.merge_from(initialisms::lint_group());
out.merge_from(be_adjective_confusions::lint_group());
diff --git a/harper-core/src/linting/proper_noun_capitalization_linters.rs b/harper-core/src/linting/proper_noun_capitalization_linters.rs
index 6249de7af..cc8330346 100644
--- a/harper-core/src/linting/proper_noun_capitalization_linters.rs
+++ b/harper-core/src/linting/proper_noun_capitalization_linters.rs
@@ -7,29 +7,23 @@ use super::{Lint, LintKind, Suggestion};
use crate::Document;
use crate::linting::expr_linter::Chunk;
use crate::parsers::PlainEnglish;
-use crate::spell::Dictionary;
use crate::{Token, TokenStringExt};
-use std::sync::Arc;
/// A linter that corrects the capitalization of multi-word proper nouns.
/// They are corrected to a "canonical capitalization" provided at construction.
///
/// If you would like to add a proper noun to Harper, see `proper_noun_rules.json`.
-pub struct ProperNounCapitalizationLinter<D: Dictionary + 'static> {
+pub struct ProperNounCapitalizationLinter {
pattern_map: ExprMap<Document>,
description: String,
- dictionary: Arc<D>,
}
-impl<D: Dictionary + 'static> ProperNounCapitalizationLinter<D> {
+impl ProperNounCapitalizationLinter {
/// Create a linter that corrects the capitalization of phrases provided.
pub fn new_strs(
canonical_versions: impl IntoIterator<Item = impl AsRef<str>>,
description: impl ToString,
- dictionary: D,
) -> Self {
- let dictionary = Arc::new(dictionary);
-
let mut expr_map = ExprMap::default();
for can_vers in canonical_versions {
@@ -42,13 +36,12 @@ impl<D: Dictionary + 'static> ProperNounCapitalizationLinter<D> {
Self {
pattern_map: expr_map,
- dictionary: dictionary.clone(),
description: description.to_string(),
}
}
}
-impl<D: Dictionary + 'static> ExprLinter for ProperNounCapitalizationLinter<D> {
+impl ExprLinter for ProperNounCapitalizationLinter {
type Unit = Chunk;
fn expr(&self) -> &dyn Expr {
@@ -96,7 +89,7 @@ struct RuleEntry {
/// For the time being, this panics on invalid JSON.
/// Do not use with user provided JSON.
-fn lint_group_from_json(json: &str, dictionary: Arc<impl Dictionary + 'static>) -> LintGroup {
+fn lint_group_from_json(json: &str) -> LintGroup {
let mut group = LintGroup::empty();
let rules: HashMap<String, RuleEntry> = serde_json::from_str(json).unwrap();
@@ -107,7 +100,6 @@ fn lint_group_from_json(json: &str, dictionary: Arc<impl Dictionary + 'static>)
Box::new(ProperNounCapitalizationLinter::new_strs(
rule.canonical,
rule.description,
- dictionary.clone(),
)),
);
}
@@ -117,92 +109,67 @@ fn lint_group_from_json(json: &str, dictionary: Arc<impl Dictionary + 'static>)
group
}
-pub fn lint_group(dictionary: Arc<impl Dictionary + 'static>) -> LintGroup {
- lint_group_from_json(include_str!("../../proper_noun_rules.json"), dictionary)
+pub fn lint_group() -> LintGroup {
+ lint_group_from_json(include_str!("../../proper_noun_rules.json"))
}
#[cfg(test)]
mod tests {
use super::lint_group;
use crate::linting::tests::{assert_lint_count, assert_suggestion_result};
- use crate::spell::FstDictionary;
#[test]
fn americas_lowercase() {
- assert_suggestion_result(
- "south america",
- lint_group(FstDictionary::curated()),
- "South America",
- );
- assert_suggestion_result(
- "north america",
- lint_group(FstDictionary::curated()),
- "North America",
- );
+ assert_suggestion_result("south america", lint_group(), "South America");
+ assert_suggestion_result("north america", lint_group(), "North America");
}
#[test]
fn americas_uppercase() {
- assert_suggestion_result(
- "SOUTH AMERICA",
- lint_group(FstDictionary::curated()),
- "South America",
- );
- assert_suggestion_result(
- "NORTH AMERICA",
- lint_group(FstDictionary::curated()),
- "North America",
- );
+ assert_suggestion_result("SOUTH AMERICA", lint_group(), "South America");
+ assert_suggestion_result("NORTH AMERICA", lint_group(), "North America");
}
#[test]
fn americas_allow_correct() {
- assert_lint_count("South America", lint_group(FstDictionary::curated()), 0);
- assert_lint_count("North America", lint_group(FstDictionary::curated()), 0);
+ assert_lint_count("South America", lint_group(), 0);
+ assert_lint_count("North America", lint_group(), 0);
}
#[test]
fn issue_798() {
assert_suggestion_result(
"The United states is a big country.",
- lint_group(FstDictionary::curated()),
+ lint_group(),
"The United States is a big country.",
);
}
#[test]
fn united_nations_uppercase() {
- assert_suggestion_result(
- "UNITED NATIONS",
- lint_group(FstDictionary::curated()),
- "United Nations",
- );
+ assert_suggestion_result("UNITED NATIONS", lint_group(), "United Nations");
}
#[test]
fn united_arab_emirates_lowercase() {
- assert_suggestion_result(
- "UNITED ARAB EMIRATES",
- lint_group(FstDictionary::curated()),
- "United Arab Emirates",
- );
+ assert_suggestion_result("UNITED ARAB EMIRATES", lint_group(), "United Arab Emirates");
}
#[test]
fn united_nations_allow_correct() {
- assert_lint_count("United Nations", lint_group(FstDictionary::curated()), 0);
+ assert_lint_count("United Nations", lint_group(), 0);
}
#[test]
fn meta_allow_correct() {
- assert_lint_count("Meta Quest", lint_group(FstDictionary::curated()), 0);
+ assert_lint_count("Meta Quest", lint_group(), 0);
}
#[test]
fn microsoft_lowercase() {
assert_suggestion_result(
"microsoft visual studio",
- lint_group(FstDictionary::curated()),
+ lint_group(),
"Microsoft Visual Studio",
);
}
@@ -211,98 +178,81 @@ mod tests {
fn microsoft_first_word_is_correct() {
assert_suggestion_result(
"Microsoft visual studio",
- lint_group(FstDictionary::curated()),
+ lint_group(),
"Microsoft Visual Studio",
);
}
#[test]
fn test_atlantic_ocean_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("atlantic ocean", lint_group(dictionary), "Atlantic Ocean");
+ assert_suggestion_result("atlantic ocean", lint_group(), "Atlantic Ocean");
}
#[test]
fn test_pacific_ocean_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("pacific ocean", lint_group(dictionary), "Pacific Ocean");
+ assert_suggestion_result("pacific ocean", lint_group(), "Pacific Ocean");
}
#[test]
fn test_indian_ocean_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("indian ocean", lint_group(dictionary), "Indian Ocean");
+ assert_suggestion_result("indian ocean", lint_group(), "Indian Ocean");
}
#[test]
fn test_southern_ocean_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("southern ocean", lint_group(dictionary), "Southern Ocean");
+ assert_suggestion_result("southern ocean", lint_group(), "Southern Ocean");
}
#[test]
fn test_arctic_ocean_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("arctic ocean", lint_group(dictionary), "Arctic Ocean");
+ assert_suggestion_result("arctic ocean", lint_group(), "Arctic Ocean");
}
#[test]
fn test_mediterranean_sea_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result(
- "mediterranean sea",
- lint_group(dictionary),
- "Mediterranean Sea",
- );
+ assert_suggestion_result("mediterranean sea", lint_group(), "Mediterranean Sea");
}
#[test]
fn test_caribbean_sea_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("caribbean sea", lint_group(dictionary), "Caribbean Sea");
+ assert_suggestion_result("caribbean sea", lint_group(), "Caribbean Sea");
}
#[test]
fn test_south_china_sea_lowercase() {
- let dictionary = FstDictionary::curated();
- assert_suggestion_result("south china sea", lint_group(dictionary), "South China Sea");
+ assert_suggestion_result("south china sea", lint_group(), "South China Sea");
}
#[test]
fn test_atlantic_ocean_correct() {
- let dictionary = FstDictionary::curated();
- assert_lint_count("Atlantic Ocean", lint_group(dictionary), 0);
+ assert_lint_count("Atlantic Ocean", lint_group(), 0);
}
#[test]
fn test_pacific_ocean_correct() {
- let dictionary = FstDictionary::curated();
- assert_lint_count("Pacific Ocean", lint_group(dictionary), 0);
+ assert_lint_count("Pacific Ocean", lint_group(), 0);
}
#[test]
fn test_indian_ocean_correct() {
- let dictionary = FstDictionary::curated();
- assert_lint_count("Indian Ocean", lint_group(dictionary), 0);
+ assert_lint_count("Indian Ocean", lint_group(), 0);
}
#[test]
fn test_mediterranean_sea_correct() {
- let dictionary = FstDictionary::curated();
- assert_lint_count("Mediterranean Sea", lint_group(dictionary), 0);
+ assert_lint_count("Mediterranean Sea", lint_group(), 0);
}
#[test]
fn test_south_china_sea_correct() {
- let dictionary = FstDictionary::curated();
- assert_lint_count("South China Sea", lint_group(dictionary), 0);
+ assert_lint_count("South China Sea", lint_group(), 0);
}
#[test]
fn day_one_in_sentence() {
assert_suggestion_result(
"I love day one. It is the best journaling app.",
- lint_group(FstDictionary::curated()),
+ lint_group(),
"I love Day One. It is the best journaling app.",
);
}
@@ -311,7 +261,7 @@ mod tests {
fn gilded_age_in_sentence() {
assert_suggestion_result(
"Mani-Chess Destiny is a JavaScript based computer game built off of chess, but in the style of the gilded age.",
- lint_group(FstDictionary::curated()),
+ lint_group(),
"Mani-Chess Destiny is a JavaScript based computer game built off of chess, but in the style of the Gilded Age.",
);
}