Skip to content

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

style(#160): rename Cases parser to CollapseIdentifiers

Grant Lemons3e322c99c734
diff --git a/harper-core/src/parsers/cases.rs b/harper-core/src/parsers/collapse_identifiers.rs
similarity index 84%
rename from harper-core/src/parsers/cases.rs
rename to harper-core/src/parsers/collapse_identifiers.rs
index 336d8e8f6..05ef63620 100644
--- a/harper-core/src/parsers/cases.rs
+++ b/harper-core/src/parsers/collapse_identifiers.rs
@@ -9,12 +9,12 @@ use crate::{Dictionary, FullDictionary, MergedDictionary, Span, Token, VecExt, W
/// A parser that wraps any other parser to collapse token strings that match
/// the pattern word_word or word-word.
-pub struct Cases {
+pub struct CollapseIdentifiers {
inner: Box<dyn Parser>,
dict: Lrc<MergedDictionary<FullDictionary>>,
}
-impl Cases {
+impl CollapseIdentifiers {
pub fn new(inner: Box<dyn Parser>, dict: &Lrc<MergedDictionary<FullDictionary>>) -> Self {
Self {
inner,
@@ -31,7 +31,7 @@ thread_local! {
.then_any_word())));
}
-impl Parser for Cases {
+impl Parser for CollapseIdentifiers {
/// This implementation is quite gross to look at, but it works.
/// If any issues arise, it would likely help to refactor this out first.
fn parse(&mut self, source: &[char]) -> Vec<Token> {
@@ -83,7 +83,8 @@ mod tests {
let dict = FullDictionary::curated();
let source = "This is a test.";
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(dict.into())).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(dict.into()))
+ .parse_str(source);
assert_eq!(tokens.len(), 8);
}
@@ -92,7 +93,7 @@ mod tests {
let source = "This is a separated_identifier, wow!";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -108,7 +109,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 10);
}
@@ -117,7 +119,7 @@ mod tests {
let source = "This is a separated-identifier, wow!";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -133,7 +135,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 10);
}
@@ -142,7 +145,7 @@ mod tests {
let source = "This is a separated_identifier_token, wow!";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -158,7 +161,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 10);
}
@@ -167,7 +171,7 @@ mod tests {
let source = "This is a separated_identifier, wow! separated_identifier";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -183,7 +187,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 12);
}
@@ -192,7 +197,7 @@ mod tests {
let source = "This is a separated_identifier_token, wow!";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -212,7 +217,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 15);
}
@@ -221,7 +227,7 @@ mod tests {
let source = "This is a separated_identifier_token, wow!";
let default_dict = FullDictionary::curated();
- let tokens = Cases::new(
+ let tokens = CollapseIdentifiers::new(
Box::new(PlainEnglish),
&Lrc::new(default_dict.clone().into()),
)
@@ -241,7 +247,8 @@ mod tests {
let mut merged_dict = MergedDictionary::from(default_dict);
merged_dict.add_dictionary(Lrc::new(dict));
- let tokens = Cases::new(Box::new(PlainEnglish), &Lrc::new(merged_dict)).parse_str(source);
+ let tokens = CollapseIdentifiers::new(Box::new(PlainEnglish), &Lrc::new(merged_dict))
+ .parse_str(source);
assert_eq!(tokens.len(), 10);
}
}
diff --git a/harper-core/src/parsers/mod.rs b/harper-core/src/parsers/mod.rs
index 6f7493550..3f1efad2c 100644
--- a/harper-core/src/parsers/mod.rs
+++ b/harper-core/src/parsers/mod.rs
@@ -1,10 +1,10 @@
-mod cases;
+mod collapse_identifiers;
mod markdown;
mod mask;
mod plain_english;
use blanket::blanket;
-pub use cases::Cases;
+pub use collapse_identifiers::CollapseIdentifiers;
pub use markdown::Markdown;
pub use mask::Mask;
pub use plain_english::PlainEnglish;
diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rs
index 0bfe975d7..c52913a59 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::{Cases, Markdown, PlainEnglish};
+use harper_core::parsers::{CollapseIdentifiers, Markdown, PlainEnglish};
use harper_core::{
Dictionary, Document, FullDictionary, MergedDictionary, Token, TokenKind, WordMetadata,
};
@@ -201,7 +201,7 @@ impl Backend {
}
Document::new_from_vec(
source,
- &mut Cases::new(Box::new(ts_parser), &doc_state.dict),
+ &mut CollapseIdentifiers::new(Box::new(ts_parser), &doc_state.dict),
&doc_state.dict,
)
} else {