Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
Merge branch 'master' into literate-haskell
Grant Lemons9ac2f2fbba71
diff --cc harper-cli/src/main.rsindex 48ba99a8e,a209e41cc..3a260d0d1--- a/harper-cli/src/main.rs+++ b/harper-cli/src/main.rs@@@ -8,8 -8,7 +8,8 @@@ use clap::Parseruse harper_comments::CommentParser;use harper_core::linting::{LintGroup, LintGroupConfig, Linter};use harper_core::parsers::Markdown;- use harper_core::{remove_overlaps, Dictionary, Document, FstDictionary};+ use harper_core::{remove_overlaps, Dictionary, Document, FstDictionary, TokenKind};+use harper_literate_haskell::LiterateHaskellParser;#[derive(Debug, Parser)]enum Args {diff --cc harper-ls/src/backend.rsindex fc1f11581,85e2d9f78..214ee6ceb--- a/harper-ls/src/backend.rs+++ b/harper-ls/src/backend.rs@@@ -206,33 -204,9 +206,33 @@@ impl Backend} else {Some(Box::new(ts_parser))}+ } else if language_id == "lhaskell" {+ let source = text.chars().collect_vec();+ let parser = LiterateHaskellParser;++ if let Some(new_dict) = parser.create_ident_dict(&source) {+ let new_dict = Arc::new(new_dict);++ if doc_state.ident_dict != new_dict {+ doc_state.ident_dict = new_dict.clone();++ let mut merged = self.generate_file_dictionary(url).await?;+ merged.add_dictionary(new_dict);+ let merged = Arc::new(merged);++ doc_state.linter = LintGroup::new(config_lock.lint_config, merged.clone());+ doc_state.dict = merged.clone();+ }+ Some(Box::new(CollapseIdentifiers::new(+ Box::new(parser),+ Box::new(doc_state.dict.clone()),+ )))+ } else {+ Some(Box::new(parser))+ }} else if language_id == "markdown" {Some(Box::new(Markdown))- } else if language_id == "git-commit" {+ } else if language_id == "git-commit" || language_id == "gitcommit" {Some(Box::new(GitCommitParser))} else if language_id == "html" {Some(Box::new(HtmlParser::default()))