Skip to content

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

feat(harper-ls): added config option to isolate English text

Elijah Potter6718b3bb0c6e
diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rs
index 0b2c254b7..45c81bdb6 100644
--- a/harper-ls/src/backend.rs
+++ b/harper-ls/src/backend.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
use anyhow::anyhow;
use harper_comments::CommentParser;
use harper_core::linting::{LintGroup, Linter};
-use harper_core::parsers::{CollapseIdentifiers, Markdown, PlainEnglish};
+use harper_core::parsers::{CollapseIdentifiers, IsolateEnglish, Markdown, Parser, PlainEnglish};
use harper_core::{
Dictionary, Document, FullDictionary, MergedDictionary, Token, TokenKind, WordMetadata,
};
@@ -182,8 +182,8 @@ impl Backend {
return Ok(());
};
- doc_state.document =
- if let Some(mut ts_parser) = CommentParser::new_from_language_id(language_id) {
+ let parser: Option<Box<dyn Parser>> =
+ if let Some(ts_parser) = CommentParser::new_from_language_id(language_id) {
let source: Vec<char> = text.chars().collect();
let source = Arc::new(source);
@@ -199,27 +199,38 @@ impl Backend {
doc_state.linter = LintGroup::new(config_lock.lint_config, merged.clone());
doc_state.dict = merged.clone();
}
- Document::new_from_vec(
- source,
- &mut CollapseIdentifiers::new(Box::new(ts_parser), &doc_state.dict),
+ Some(Box::new(CollapseIdentifiers::new(
+ Box::new(ts_parser),
&doc_state.dict,
- )
+ )))
} else {
- Document::new_from_vec(source, &mut ts_parser, &doc_state.dict)
+ Some(Box::new(ts_parser))
}
} else if language_id == "markdown" {
- Document::new(text, &mut Markdown, &doc_state.dict)
+ Some(Box::new(Markdown))
} else if language_id == "gitcommit" {
- Document::new(text, &mut GitCommitParser, &doc_state.dict)
+ Some(Box::new(GitCommitParser))
} else if language_id == "html" {
- Document::new(text, &mut HtmlParser::default(), &doc_state.dict)
+ Some(Box::new(HtmlParser::default()))
} else if language_id == "mail" {
- Document::new(text, &mut PlainEnglish, &doc_state.dict)
+ Some(Box::new(PlainEnglish))
} else {
- doc_lock.remove(url);
- return Ok(());
+ None
};
+ match parser {
+ None => {
+ doc_lock.remove(url);
+ }
+ Some(mut parser) => {
+ if self.config.read().await.isolate_english {
+ parser = Box::new(IsolateEnglish::new(parser, doc_state.dict.clone()));
+ }
+
+ doc_state.document = Document::new(text, &mut parser, &doc_state.dict);
+ }
+ }
+
Ok(())
}
diff --git a/harper-ls/src/config.rs b/harper-ls/src/config.rs
index 9c0679223..74239f374 100644
--- a/harper-ls/src/config.rs
+++ b/harper-ls/src/config.rs
@@ -69,6 +69,7 @@ pub struct Config {
pub lint_config: LintGroupConfig,
pub diagnostic_severity: DiagnosticSeverity,
pub code_action_config: CodeActionConfig,
+ pub isolate_english: bool,
}
impl Config {
@@ -113,6 +114,16 @@ impl Config {
base.code_action_config = CodeActionConfig::from_lsp_config(v.clone())?;
}
+ if let Some(v) = value.get("isolateEnglish") {
+ if let Value::Bool(v) = v {
+ base.isolate_english = *v;
+ } else {
+ return Err(anyhow::format_err!(
+ "isolateEnglish path must be a boolean."
+ ));
+ }
+ }
+
Ok(base)
}
}
@@ -127,6 +138,7 @@ impl Default for Config {
lint_config: LintGroupConfig::default(),
diagnostic_severity: DiagnosticSeverity::Hint,
code_action_config: CodeActionConfig::default(),
+ isolate_english: false,
}
}
}