Skip to content

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

Merge branch 'master' into typst-support

Grant Lemons32da8f8b34eb
diff --cc harper-core/src/patterns/sequence_pattern.rs
index b503889bc,39d538c32..516c7debe
--- a/harper-core/src/patterns/sequence_pattern.rs
+++ b/harper-core/src/patterns/sequence_pattern.rs
@@@ -43,7 -56,7 +56,8 @@@ impl SequencePattern
gen_then_from_is!(case_separator);
gen_then_from_is!(adverb);
gen_then_from_is!(adjective);
+ gen_then_from_is!(apostrophe);
+ gen_then_from_is!(hyphen);
pub fn then_exact_word(mut self, word: &'static str) -> Self {
self.token_patterns
diff --cc harper-core/tests/run_tests.rs
index 6a258a27f,eec355838..37602854a
--- a/harper-core/tests/run_tests.rs
+++ b/harper-core/tests/run_tests.rs
@@@ -39,16 -36,13 +39,18 @@@ macro_rules! create_test
};
}
-create_test!(whack_bullets.md, 1);
-create_test!(preexisting.md, 0);
-create_test!(issue_109.md, 0);
-create_test!(issue_109_ext.md, 0);
-create_test!(chinese_lorem_ipsum.md, 2);
-create_test!(obsidian_links.md, 2);
-create_test!(issue_267.md, 0);
-create_test!(proper_noun_capitalization.md, 2);
-create_test!(amazon_hostname.md, 0);
-create_test!(issue_159.md, 1);
+create_test!(whack_bullets.md, &Markdown, 1);
+create_test!(preexisting.md, &Markdown, 0);
+create_test!(issue_109.md, &Markdown, 0);
+create_test!(issue_109_ext.md, &Markdown, 0);
+create_test!(chinese_lorem_ipsum.md, &Markdown, 2);
+create_test!(obsidian_links.md, &Markdown, 2);
+create_test!(issue_267.md, &Markdown, 0);
+create_test!(proper_noun_capitalization.md, &Markdown, 2);
++create_test!(amazon_hostname.md, &Markdown, 0);
++create_test!(issue_159.md, &Markdown, 1);
+
+#[cfg(feature = "typst")]
+create_test!(complex_typst.typ, &Typst, 0);
+#[cfg(feature = "typst")]
- create_test!(typst_spelling_mistakes.typ, &Typst, 4);
++create_test!(typst_spelling_mistakes.typ, &Typst, 4);
diff --cc harper-ls/src/backend.rs
index 422dec2c5,85e2d9f78..9e13e2fe9
--- a/harper-ls/src/backend.rs
+++ b/harper-ls/src/backend.rs
@@@ -208,9 -206,7 +208,9 @@@ impl Backend
}
} else if language_id == "markdown" {
Some(Box::new(Markdown))
+ } else if language_id == "typst" {
+ Some(Box::new(Typst))
- } 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()))