Merge branch 'master' into all-repeated

Cargo.toml

@@ -3,5 +3,5 @@ members = [ "harper-cli", "harper-core", "harper-ls", "harper-comments", "harper
 resolver = "2"
 
 [profile.release]
-opt-level = 3 
+opt-level = 3
 strip = true

harper-cli/Cargo.toml

@@ -7,9 +7,9 @@ publish = false
 repository = "https://github.com/elijah-potter/harper"
 
 [dependencies]
-anyhow = "1.0.92"
+anyhow = "1.0.93"
 ariadne = "0.4.1"
-clap = { version = "4.5.20", features = ["derive"] }
+clap = { version = "4.5.21", features = ["derive"] }
 harper-core = { path = "../harper-core", version = "0.12.0" }
 harper-comments = { path = "../harper-comments", version = "0.12.0" }
-serde_json = "1.0.132"
+serde_json = "1.0.133"

harper-cli/src/main.rs

@@ -8,7 +8,7 @@ use clap::Parser;
 use harper_comments::CommentParser;
 use harper_core::linting::{LintGroup, LintGroupConfig, Linter};
 use harper_core::parsers::Markdown;
-use harper_core::{remove_overlaps, Dictionary, Document, FullDictionary};
+use harper_core::{remove_overlaps, Dictionary, Document, FstDictionary};
 
 #[derive(Debug, Parser)]
 enum Args {
@@ -37,7 +37,7 @@ fn main() -> anyhow::Result<()> {
         Args::Lint { file, count } => {
             let (doc, source) = load_file(&file)?;
 
-            let mut linter = LintGroup::new(LintGroupConfig::default(), FullDictionary::curated());
+            let mut linter = LintGroup::new(LintGroupConfig::default(), FstDictionary::curated());
             let mut lints = linter.lint(&doc);
 
             if count {
@@ -85,7 +85,7 @@ fn main() -> anyhow::Result<()> {
             Ok(())
         }
         Args::Words => {
-            let dict = FullDictionary::curated();
+            let dict = FstDictionary::curated();
 
             let mut word_str = String::new();
 

harper-comments/src/comment_parser.rs

@@ -34,7 +34,7 @@ impl CommentParser {
             "csharp" => tree_sitter_c_sharp::language(),
             "toml" => tree_sitter_toml::language(),
             "lua" => tree_sitter_lua::language(),
-            "sh" => tree_sitter_bash::language(),
+            "shellscript" => tree_sitter_bash::language(),
             "java" => tree_sitter_java::language(),
             _ => return None,
         };
@@ -82,8 +82,8 @@ impl CommentParser {
             "cs" => "csharp",
             "toml" => "toml",
             "lua" => "lua",
-            "sh" => "sh",
-            "bash" => "sh",
+            "sh" => "shellscript",
+            "bash" => "shellscript",
             "java" => "java",
             _ => return None,
         })

harper-comments/tests/language_support.rs

@@ -2,7 +2,7 @@ use std::path::Path;
 
 use harper_comments::CommentParser;
 use harper_core::linting::{LintGroup, LintGroupConfig, Linter};
-use harper_core::{Document, FullDictionary};
+use harper_core::{Document, FstDictionary};
 
 /// Creates a unit test checking that the linting of a source file in
 /// `language_support_sources` produces the expected number of lints.
@@ -21,7 +21,7 @@ macro_rules! create_test {
                  );
 
                  let mut parser = CommentParser::new_from_filename(Path::new(filename)).unwrap();
-                 let dict = FullDictionary::curated();
+                 let dict = FstDictionary::curated();
                  let document = Document::new(&source, &mut parser, &dict);
 
                  let mut linter = LintGroup::new(

harper-core/Cargo.toml

@@ -9,18 +9,21 @@ repository = "https://github.com/elijah-potter/harper"
 
 [dependencies]
 blanket = "0.4.0"
-hashbrown = { version = "0.15.0", features = ["serde"] }
+fst = "0.4.7"
+hashbrown = { version = "0.15.1", features = ["serde"] }
 is-macro = "0.3.6"
 itertools = "0.13.0"
+lazy_static = "1.5.0"
 ordered-float = { version = "4.5.0", features = ["serde"] }
 paste = "1.0.14"
 pulldown-cmark = "0.12.2"
 serde = { version = "1.0.214", features = ["derive"] }
-serde_json = "1.0.132"
+serde_json = "1.0.133"
 smallvec = { version = "1.13.2", features = ["serde"] }
-thiserror = "1.0.67"
+thiserror = "2.0.3"
 unicode-blocks = "0.1.9"
 unicode-width = "0.2.0"
+levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", default-features = false }