Skip to content

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

Merge remote-tracking branch 'upstream/master' into typst-support

Grant Lemons0f55ab1f79e0
diff --cc Cargo.lock
index 8d823e6e9,15375cced..715d0a907
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -672,8 -638,7 +673,8 @@@ dependencies =
"harper-comments",
"harper-core",
"harper-html",
+ "harper-typst",
- "itertools 0.13.0",
+ "itertools 0.14.0",
"once_cell",
"open",
"resolve-path",
@@@ -693,17 -658,6 +694,17 @@@ dependencies =
"tree-sitter",
]
+[[package]]
+name = "harper-typst"
+version = "0.14.0"
+dependencies = [
+ "harper-core",
- "itertools 0.13.0",
++ "itertools 0.14.0",
+ "ordered-float",
+ "paste",
+ "typst-syntax",
+]
+
[[package]]
name = "harper-wasm"
version = "0.1.0"
@@@ -1305,31 -1237,11 +1300,31 @@@ dependencies =
"serde",
]
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
[[package]]
name = "redox_syscall"
- version = "0.5.7"
+ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+ checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
dependencies = [
"bitflags 2.6.0",
]
@@@ -2008,42 -1875,11 +2013,42 @@@ dependencies =
"tree-sitter",
]
+[[package]]
+name = "typst-syntax"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b7be8b6ed6b2cb39ca495947d548a28d7db0ba244008e44c5a759120327693"
+dependencies = [
+ "ecow",
+ "once_cell",
+ "serde",
+ "toml",
+ "typst-utils",
+ "unicode-ident",
+ "unicode-math-class",
+ "unicode-script",
+ "unicode-segmentation",
+ "unscanny",
+]
+
+[[package]]
+name = "typst-utils"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f0305443ed97f0b658471487228f86bf835705e7525fbdcc671cebd864f7a40"
+dependencies = [
+ "once_cell",
+ "portable-atomic",
+ "rayon",
+ "siphasher",
+ "thin-vec",
+]
+
[[package]]
name = "unicase"
- version = "2.8.0"
+ version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
[[package]]
name = "unicode-blocks"
@@@ -2053,28 -1889,10 +2058,28 @@@ checksum = "6b12e05d9e06373163a9bb6bb8c
[[package]]
name = "unicode-ident"
- version = "1.0.13"
+ version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+ checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+[[package]]
+name = "unicode-math-class"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
[[package]]
name = "unicode-width"
version = "0.1.14"
@@@ -2087,17 -1905,11 +2092,17 @@@ version = "0.2.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+[[package]]
+name = "unscanny"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
+
[[package]]
name = "url"
- version = "2.5.3"
+ version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+ checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
dependencies = [
"form_urlencoded",
"idna",
diff --cc harper-core/src/patterns/sequence_pattern.rs
index 516c7debe,1d4d63218..c9893ac23
--- a/harper-core/src/patterns/sequence_pattern.rs
+++ b/harper-core/src/patterns/sequence_pattern.rs
@@@ -56,9 -56,13 +56,14 @@@ 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);
+ /// Add a pattern that looks for more complex ideas, like nouns with adjectives attached.
+ pub fn then_noun_phrase(self) -> Self {
+ self.then(Box::new(NounPhrase))
+ }
+
pub fn then_exact_word(mut self, word: &'static str) -> Self {
self.token_patterns
.push(Box::new(|tok: &Token, source: &[char]| {
diff --cc harper-typst/Cargo.toml
index cafbf3365,000000000..38223b2e3
mode 100644,000000..100644
--- a/harper-typst/Cargo.toml
+++ b/harper-typst/Cargo.toml
@@@ -1,14 -1,0 +1,14 @@@
+[package]
+name = "harper-typst"
+version = "0.14.0"
+edition = "2021"
+description = "The language checker for developers."
+license = "Apache-2.0"
+repository = "https://github.com/automattic/harper"
+
+[dependencies]
+harper-core = { path = "../harper-core", version = "0.14.0" }
+typst-syntax = { version = "0.12.0" }
+ordered-float = { version = "4.6.0", features = ["serde"] }
- itertools = "0.13.0"
++itertools = "0.14.0"
+paste = "1.0.14"