Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
feat(#160): update dict type Cases accepts and make harper-ls wrap CommentParser with it
Grant Lemonsdef8291f57e4
diff --git a/harper-core/src/parsers/cases.rs b/harper-core/src/parsers/cases.rsindex 57c53b5f9..e5583196c 100644--- a/harper-core/src/parsers/cases.rs+++ b/harper-core/src/parsers/cases.rs@@ -1,22 +1,26 @@use std::collections::VecDeque;use std::rc::Rc as Lrc;+use std::sync::Arc;use itertools::Itertools;use super::{Parser, TokenKind};use crate::patterns::{PatternExt, SequencePattern};-use crate::{Dictionary, FullDictionary, Span, Token, VecExt, WordMetadata};+use crate::{Dictionary, FullDictionary, MergedDictionary, Span, Token, VecExt, WordMetadata};/// A parser that wraps any other parser to collapse token strings that match/// the pattern word_word or word-word.pub struct Cases {inner: Box<dyn Parser>,- dict: FullDictionary,+ dict: Arc<MergedDictionary<FullDictionary>>,}impl Cases {- pub fn new(inner: Box<dyn Parser>, dict: FullDictionary) -> Self {- Self { inner, dict }+ pub fn new(inner: Box<dyn Parser>, dict: &Arc<MergedDictionary<FullDictionary>>) -> Self {+ Self {+ inner,+ dict: dict.clone(),+ }}}@@ -79,19 +83,20 @@ mod tests {#[test]fn no_collapse() {- let dict = FullDictionary::new();+ let mut dict = FullDictionary::curated();let source = "This is a test.";- let tokens = Cases::new(Box::new(PlainEnglish), dict).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &Arc::new(dict.into())).parse_str(source);assert_eq!(tokens.len(), 8);}#[test]fn one_collapse() {let source = "This is a separated_identifier, wow!";- let mut dict = FullDictionary::new();+ let mut dict = FullDictionary::curated();- let tokens = Cases::new(Box::new(PlainEnglish), dict.clone()).parse_str(source);+ let tokens =+ Cases::new(Box::new(PlainEnglish), &Arc::new(dict.clone().into())).parse_str(source);assert_eq!(tokens.len(), 13);dict.append_word(@@ -99,37 +104,39 @@ mod tests {WordMetadata::default(),);- let tokens = Cases::new(Box::new(PlainEnglish), dict).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &Arc::new(dict.into())).parse_str(source);assert_eq!(tokens.len(), 10);}#[test]fn double_collapse() {let source = "This is a separated_identifier_token, wow!";- let mut dict = FullDictionary::new();+ let mut dict = FullDictionary::curated();- let tokens = Cases::new(Box::new(PlainEnglish), dict.clone()).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &Arc::new(dict.into())).parse_str(source);assert_eq!(tokens.len(), 15);- dict.append_word(+ let mut new_dict = FullDictionary::new();+ new_dict.append_word("separated_identifier".chars().collect_vec(),WordMetadata::default(),);- dict.append_word(+ new_dict.append_word("separated_identifier_token".chars().collect_vec(),WordMetadata::default(),);+ dict.add_dictionary(Arc::new(new_dict));- let tokens = Cases::new(Box::new(PlainEnglish), dict).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &dict).parse_str(source);assert_eq!(tokens.len(), 10);}#[test]fn two_collapses() {let source = "This is a separated_identifier, wow! separated_identifier";- let mut dict = FullDictionary::new();+ let mut dict = FullDictionary::curated();- let tokens = Cases::new(Box::new(PlainEnglish), dict.clone()).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &dict).parse_str(source);assert_eq!(tokens.len(), 17);dict.append_word(@@ -137,7 +144,7 @@ mod tests {WordMetadata::default(),);- let tokens = Cases::new(Box::new(PlainEnglish), dict).parse_str(source);+ let tokens = Cases::new(Box::new(PlainEnglish), &dict).parse_str(source);assert_eq!(tokens.len(), 12);}}diff --git a/harper-core/src/spell/merged_dictionary.rs b/harper-core/src/spell/merged_dictionary.rsindex 055e5cdc1..bca70e8fa 100644--- a/harper-core/src/spell/merged_dictionary.rs+++ b/harper-core/src/spell/merged_dictionary.rs@@ -32,6 +32,18 @@ where}}+impl<T> From<Arc<T>> for MergedDictionary<T>+where+ T: Dictionary + Clone,+{+ fn from(value: Arc<T>) -> Self {+ Self {+ children: vec![value],+ ..Default::default()+ }+ }+}+impl<T> Default for MergedDictionary<T>whereT: Dictionary + Clone,diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rsindex afe6df7d1..0bfe975d7 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::{Markdown, PlainEnglish};+use harper_core::parsers::{Cases, Markdown, PlainEnglish};use harper_core::{Dictionary, Document, FullDictionary, MergedDictionary, Token, TokenKind, WordMetadata,};@@ -199,9 +199,14 @@ impl Backend {doc_state.linter = LintGroup::new(config_lock.lint_config, merged.clone());doc_state.dict = merged.clone();}+ Document::new_from_vec(+ source,+ &mut Cases::new(Box::new(ts_parser), &doc_state.dict),+ &doc_state.dict,+ )+ } else {+ Document::new_from_vec(source, &mut ts_parser, &doc_state.dict)}-- Document::new_from_vec(source, &mut ts_parser, &doc_state.dict)} else if language_id == "markdown" {Document::new(text, &mut Markdown, &doc_state.dict)} else if language_id == "gitcommit" {