Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
feat: now obeys LSP `languageId` rather than use file extensions.
Elijah Potter631b9908d4f2
diff --git a/harper-core/src/lexing/mod.rs b/harper-core/src/lexing/mod.rsindex 0f6bd7e5e..5e1e97620 100644--- a/harper-core/src/lexing/mod.rs+++ b/harper-core/src/lexing/mod.rs@@ -61,14 +61,11 @@ pub fn lex_number(source: &[char]) -> Option<FoundToken> {return None;}- let Some(end) = source+ let end = source.iter().enumerate().rev()- .find_map(|(i, v)| v.is_numeric().then_some(i))- else {- return None;- };+ .find_map(|(i, v)| v.is_numeric().then_some(i))?;{let s: String = source[0..end + 1].iter().collect();diff --git a/harper-core/src/spell/hunspell/attributes.rs b/harper-core/src/spell/hunspell/attributes.rsindex 2b657a1cf..1bc4bf21a 100644--- a/harper-core/src/spell/hunspell/attributes.rs+++ b/harper-core/src/spell/hunspell/attributes.rs@@ -208,9 +208,7 @@ impl AttributeList {}for c in &remove {- let Some(last) = replaced_segment.last() else {- return None;- };+ let last = replaced_segment.last()?;if last == c {replaced_segment.pop();diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rsindex cf4ee01ab..d15a1115e 100644--- a/harper-ls/src/backend.rs+++ b/harper-ls/src/backend.rs@@ -58,7 +58,8 @@ use crate::tree_sitter_parser::TreeSitterParser;struct DocumentState {document: Document,ident_dict: Arc<FullDictionary>,- linter: LintGroup<MergedDictionary<FullDictionary>>+ linter: LintGroup<MergedDictionary<FullDictionary>>,+ language_id: Option<String>}/// Deallocate@@ -188,7 +189,11 @@ impl Backend {}#[instrument(skip(self))]- async fn update_document_from_file(&self, url: &Url) -> anyhow::Result<()> {+ async fn update_document_from_file(+ &self,+ url: &Url,+ language_id: Option<&str>+ ) -> anyhow::Result<()> {let content = match tokio::fs::read_to_string(url.to_file_path().map_err(|_| anyhow::format_err!("Could not extract file path."))?@@ -202,14 +207,21 @@ impl Backend {}};- self.update_document(url, &content).await+ self.update_document(url, &content, language_id).await}#[instrument(skip(self, text))]- async fn update_document(&self, url: &Url, text: &str) -> anyhow::Result<()> {+ async fn update_document(+ &self,+ url: &Url,+ text: &str,+ language_id: Option<&str>+ ) -> anyhow::Result<()> {let mut doc_lock = self.doc_state.lock().await;let config_lock = self.config.read().await;+ let prev_state = doc_lock.get(url);+// TODO: Only reset linter when underlying dictionaries changelet mut doc_state = DocumentState {@@ -217,13 +229,19 @@ impl Backend {config_lock.lint_config,self.generate_file_dictionary(url).await?),+ language_id: language_id+ .map(|v| v.to_string())+ .or(prev_state.and_then(|s| s.language_id.clone())),..Default::default()};- doc_state.document = if let Some(extension) = url.to_file_path().unwrap().extension() {- if let Some(ts_parser) =- TreeSitterParser::new_from_extension(&extension.to_string_lossy())- {+ let Some(language_id) = &doc_state.language_id else {+ doc_lock.remove(url);+ return Ok(());+ };++ doc_state.document =+ if let Some(ts_parser) = TreeSitterParser::new_from_language_id(language_id) {let source: Vec<char> = text.chars().collect();if let Some(new_dict) = ts_parser.create_ident_dict(source.as_slice()) {@@ -239,12 +257,12 @@ impl Backend {}Document::new_from_vec(source, Box::new(ts_parser))- } else {+ } else if language_id == "markdown" {Document::new(text, Box::new(Markdown))- }- } else {- Document::new(text, Box::new(Markdown))- };+ } else {+ doc_lock.remove(url);+ return Ok(());+ };doc_lock.insert(url.clone(), doc_state);@@ -377,7 +395,7 @@ impl LanguageServer for Backend {.await;let _ = self- .update_document_from_file(¶ms.text_document.uri)+ .update_document_from_file(¶ms.text_document.uri, None).await;self.publish_diagnostics(¶ms.text_document.uri).await;@@ -389,7 +407,10 @@ impl LanguageServer for Backend {.await;let _ = self- .update_document_from_file(¶ms.text_document.uri)+ .update_document_from_file(+ ¶ms.text_document.uri,+ Some(¶ms.text_document.language_id)+ ).await;self.publish_diagnostics(¶ms.text_document.uri).await;@@ -404,7 +425,7 @@ impl LanguageServer for Backend {.log_message(MessageType::INFO, "File changed!").await;- self.update_document(¶ms.text_document.uri, &last.text)+ self.update_document(¶ms.text_document.uri, &last.text, None).await.unwrap();self.publish_diagnostics(¶ms.text_document.uri).await;@@ -444,7 +465,7 @@ impl LanguageServer for Backend {error!("Unable to save user dictionary: {}", err);}- let _ = self.update_document_from_file(&file_url).await;+ let _ = self.update_document_from_file(&file_url, None).await;self.publish_diagnostics(&file_url).await;}"HarperAddToFileDict" => {@@ -463,7 +484,7 @@ impl LanguageServer for Backend {error!("Unable to save file dictionary: {}", err);}- let _ = self.update_document_from_file(&file_url).await;+ let _ = self.update_document_from_file(&file_url, None).await;self.publish_diagnostics(&file_url).await;}"HarperOpen" => match open::that(&first) {@@ -509,7 +530,11 @@ impl LanguageServer for Backend {doc_state.keys().cloned().collect()};- futures::future::join_all(keys.iter().map(|key| self.update_document_from_file(key))).await;+ futures::future::join_all(+ keys.iter()+ .map(|key| self.update_document_from_file(key, None))+ )+ .await;}async fn code_action(&self, params: CodeActionParams) -> Result<Option<CodeActionResponse>> {diff --git a/harper-ls/src/tree_sitter_parser.rs b/harper-ls/src/tree_sitter_parser.rsindex c3ee76920..b600d9fab 100644--- a/harper-ls/src/tree_sitter_parser.rs+++ b/harper-ls/src/tree_sitter_parser.rs@@ -14,29 +14,26 @@ pub struct TreeSitterParser {}impl TreeSitterParser {- pub fn new_from_extension(file_extension: &str) -> Option<Self> {- let language = match file_extension {- "rs" => tree_sitter_rust::language(),- "tsx" => tree_sitter_typescript::language_tsx(),- "ts" => tree_sitter_typescript::language_typescript(),+ pub fn new_from_language_id(language_id: &str) -> Option<Self> {+ let language = match language_id {+ "rust" => tree_sitter_rust::language(),+ "typescriptreact" => tree_sitter_typescript::language_tsx(),+ "typescript" => tree_sitter_typescript::language_typescript(),"py" => tree_sitter_python::language(),- "js" => tree_sitter_javascript::language(),- "mjs" => tree_sitter_javascript::language(),- "cjs" => tree_sitter_javascript::language(),+ "javascript" => tree_sitter_javascript::language(),+ "javascriptreact" => tree_sitter_typescript::language_tsx(),"go" => tree_sitter_go::language(),"c" => tree_sitter_c::language(),"cpp" => tree_sitter_cpp::language(),- "h" => tree_sitter_cpp::language(),- "hpp" => tree_sitter_cpp::language(),- "rb" => tree_sitter_ruby::language(),+ "ruby" => tree_sitter_ruby::language(),"swift" => tree_sitter_swift::language(),- "cs" => tree_sitter_c_sharp::language(),+ "csharp" => tree_sitter_c_sharp::language(),"toml" => tree_sitter_toml::language(),"lua" => tree_sitter_lua::language(),_ => return None};- let comment_parser: Box<dyn Parser> = match file_extension {+ let comment_parser: Box<dyn Parser> = match language_id {"go" => Box::new(Go),_ => Box::new(Unit)};