Overhaul

harper-cli/src/main.rs

@@ -7,7 +7,7 @@ use anyhow::format_err;
 use ariadne::{Color, Label, Report, ReportKind, Source};
 use clap::Parser;
 use harper_comments::CommentParser;
-use harper_core::linting::{LintGroup, LintGroupConfig, Linter};
+use harper_core::linting::{LintGroup, Linter};
 use harper_core::parsers::{Markdown, MarkdownOptions};
 use harper_core::spell::hunspell::parse_default_attribute_list;
 use harper_core::spell::hunspell::word_list::parse_word_list;
@@ -57,14 +57,13 @@ enum Args {
 fn main() -> anyhow::Result<()> {
     let args = Args::parse();
     let markdown_options = MarkdownOptions::default();
-    let linting_options = LintGroupConfig::default();
     let dictionary = FstDictionary::curated();
 
     match args {
         Args::Lint { file, count } => {
             let (doc, source) = load_file(&file, markdown_options)?;
 
-            let mut linter = LintGroup::new(linting_options, dictionary);
+            let mut linter = LintGroup::new_curated(dictionary);
             let mut lints = linter.lint(&doc);
 
             if count {
@@ -199,15 +198,14 @@ fn main() -> anyhow::Result<()> {
                 description: String,
             }
 
-            let mut linter = LintGroup::new(linting_options, dictionary);
-            linter.config.fill_default_values();
+            let linter = LintGroup::new_curated(dictionary);
 
             let default_config: HashMap<String, bool> =
                 serde_json::from_str(&serde_json::to_string(&linter.config).unwrap()).unwrap();
 
             // Use `BTreeMap` so output is sorted by keys.
             let mut configs = BTreeMap::new();
-            for (key, desc) in linter.all_descriptions().to_vec_pairs() {
+            for (key, desc) in linter.all_descriptions() {
                 configs.insert(
                     key.to_owned(),
                     Config {

harper-comments/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "harper-comments"
 version = "0.22.0"
-edition = "2021"
+edition = "2024"
 description = "The language checker for developers."
 license = "Apache-2.0"
 readme = "README.md"

harper-comments/src/comment_parsers/go.rs

@@ -1,6 +1,6 @@
-use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 use harper_core::Lrc;
 use harper_core::Token;
+use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 
 use super::without_initiators;
 

harper-comments/src/comment_parsers/jsdoc.rs

@@ -1,5 +1,5 @@
-use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 use harper_core::Lrc;
+use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 use harper_core::{Punctuation, Span, Token, TokenKind};
 use itertools::Itertools;
 
@@ -162,7 +162,7 @@ fn parse_inline_tag(tokens: &[Token]) -> Option<usize> {
 
 #[cfg(test)]
 mod tests {
-    use harper_core::{parsers::MarkdownOptions, Document, Punctuation, TokenKind};
+    use harper_core::{Document, Punctuation, TokenKind, parsers::MarkdownOptions};
 
     use crate::CommentParser;
 
@@ -226,8 +226,10 @@ mod tests {
             CommentParser::new_from_language_id("javascript", MarkdownOptions::default()).unwrap();
         let document = Document::new_curated(source, &parser);
 
-        assert!(document
-            .tokens()
-            .all(|t| t.kind.is_unlintable() || t.kind.is_newline() || t.kind.is_paragraph_break()));
+        assert!(
+            document.tokens().all(|t| t.kind.is_unlintable()
+                || t.kind.is_newline()
+                || t.kind.is_paragraph_break())
+        );
     }
 }

harper-comments/src/comment_parsers/unit.rs

@@ -1,5 +1,5 @@
-use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 use harper_core::Lrc;
+use harper_core::parsers::{Markdown, MarkdownOptions, Parser};
 use harper_core::{Span, Token};
 
 use super::without_initiators;

harper-comments/tests/language_support.rs

@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use harper_comments::CommentParser;
-use harper_core::linting::{LintGroup, LintGroupConfig, Linter};
+use harper_core::linting::{LintGroup, Linter};
 use harper_core::parsers::MarkdownOptions;
 use harper_core::{Document, FstDictionary};
 
@@ -25,10 +25,7 @@ macro_rules! create_test {
                  let dict = FstDictionary::curated();
                  let document = Document::new(&source, &parser, &dict);
 
-                 let mut linter = LintGroup::new(
-                     LintGroupConfig::default(),
-                     dict
-                 );
+                 let mut linter = LintGroup::new_curated(dict);
                  let lints = linter.lint(&document);
 
                  dbg!(&lints);

harper-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "harper-core"
 version = "0.22.0"
-edition = "2021"
+edition = "2024"
 description = "The language checker for developers."
 license = "Apache-2.0"
 readme = "README.md"
@@ -25,6 +25,7 @@ unicode-blocks = "0.1.9"
 unicode-script = "0.5.7"
 unicode-width = "0.2.0"
 levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] }
+cached = "0.54.0"
 
 [dev-dependencies]
 criterion = { version = "0.5.1", default-features = false }