Skip to content

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

feat(harper-typst): update to Typst `0.14.2` (#2566)

Elijah Potterb301e073ef98
diff --git a/Cargo.lock b/Cargo.lock
index 4039ab0a3..c3bc10850 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6117,11 +6117,12 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
[[package]]
name = "typst-syntax"
-version = "0.13.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ba949ac75a374ea6b2f61d32e6c63acb818e6179d16f78b2cba988fbb5e23a8"
+checksum = "a95d9192060e23b1e491b0b94dff676acddc92a4d672aeb8ca3890a5a734e879"
dependencies = [
"ecow",
+ "rustc-hash 2.1.1",
"serde",
"toml 0.8.23",
"typst-timing",
@@ -6135,9 +6136,9 @@ dependencies = [
[[package]]
name = "typst-timing"
-version = "0.13.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba4541664e98be2023db2267d92af206190eb903063a0229c668e1ab9dca976"
+checksum = "7be94f8faf19841b49574ef5c7fd7a12e2deb7c3d8deba5a596f35d2222024cd"
dependencies = [
"parking_lot",
"serde",
@@ -6146,13 +6147,14 @@ dependencies = [
[[package]]
name = "typst-utils"
-version = "0.13.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eb71d59967e0fb32341f8a94f41ced8da520c63705cca2686ae653c9408fd96"
+checksum = "a3966c92e8fa48c7ce898130d07000d985f18206d92b250f0f939287fbccdee3"
dependencies = [
"once_cell",
"portable-atomic",
"rayon",
+ "rustc-hash 2.1.1",
"siphasher",
"thin-vec",
"unicode-math-class",
diff --git a/harper-typst/Cargo.toml b/harper-typst/Cargo.toml
index 5907de8dd..aa88719c0 100644
--- a/harper-typst/Cargo.toml
+++ b/harper-typst/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/automattic/harper"
[dependencies]
harper-core = { path = "../harper-core", version = "1.0.0" }
-typst-syntax = { version = "0.13.1" }
+typst-syntax = { version = "0.14.2" }
ordered-float = { version = "5.1.0", features = ["serde"] }
itertools = "0.14.0"
paste = "1.0.14"
diff --git a/harper-typst/src/lib.rs b/harper-typst/src/lib.rs
index 0219041d2..71c060fd4 100644
--- a/harper-typst/src/lib.rs
+++ b/harper-typst/src/lib.rs
@@ -49,8 +49,8 @@ fn convert_parbreaks<'a>(buf: &'a mut Vec<SyntaxNode>, exprs: &'a [Expr]) -> Vec
let should_parbreak = |e1, e2, e3| {
matches!(e2, Expr::Space(_))
- && (matches!(e1, Expr::Heading(_) | Expr::List(_))
- || matches!(e3, Expr::Heading(_) | Expr::List(_)))
+ && (matches!(e1, Expr::Heading(_) | Expr::ListItem(_))
+ || matches!(e3, Expr::Heading(_) | Expr::ListItem(_)))
};
let mut res: Vec<Expr> = Vec::new();
diff --git a/harper-typst/src/offset_cursor.rs b/harper-typst/src/offset_cursor.rs
index a81f24f9e..0c727ac38 100644
--- a/harper-typst/src/offset_cursor.rs
+++ b/harper-typst/src/offset_cursor.rs
@@ -28,7 +28,7 @@ impl<'a> OffsetCursor<'a> {
}
Some(Self {
- char: self.char + self.doc.get(self.byte..new_byte)?.chars().count(),
+ char: self.char + self.doc.text().get(self.byte..new_byte)?.chars().count(),
byte: new_byte,
..self
})
diff --git a/harper-typst/src/typst_translator.rs b/harper-typst/src/typst_translator.rs
index a35f193e8..ee24aad2c 100644
--- a/harper-typst/src/typst_translator.rs
+++ b/harper-typst/src/typst_translator.rs
@@ -101,7 +101,7 @@ impl<'a> TypstTranslator<'a> {
return None;
}
- let joined = self.doc.get(left_range.start..right_range.end)?;
+ let joined = self.doc.text().get(left_range.start..right_range.end)?;
let offset = OffsetCursor::new(self.doc).push_to_span(left.span())?;
let parsed = self.parse_english(joined, offset)?;
@@ -205,6 +205,7 @@ impl<'a> TypstTranslator<'a> {
macro_rules! get_text {
($expr:expr) => {
self.doc
+ .text()
.get(self.doc.range($expr.span())?)
.expect("Unable to get text from typst document span!")
};
@@ -342,9 +343,9 @@ impl<'a> TypstTranslator<'a> {
Expr::Emph(emph) => iter_recurse(&mut emph.body().exprs()),
Expr::Link(a) => token!(a, TokenKind::Url),
Expr::Heading(heading) => iter_recurse(&mut heading.body().exprs()),
- Expr::List(list_item) => iter_recurse(&mut list_item.body().exprs()),
- Expr::Enum(enum_item) => iter_recurse(&mut enum_item.body().exprs()),
- Expr::Term(term_item) => iter_recurse(
+ Expr::ListItem(list_item) => iter_recurse(&mut list_item.body().exprs()),
+ Expr::EnumItem(enum_item) => iter_recurse(&mut enum_item.body().exprs()),
+ Expr::TermItem(term_item) => iter_recurse(
&mut term_item
.term()
.exprs()
@@ -365,7 +366,7 @@ impl<'a> TypstTranslator<'a> {
.collect_vec(),
)
}
- Expr::Content(content_block) => {
+ Expr::ContentBlock(content_block) => {
isolate(iter_recurse(&mut content_block.body().exprs()))
}
Expr::Parenthesized(parenthesized) => recurse!(parenthesized.expr()),
@@ -401,22 +402,22 @@ impl<'a> TypstTranslator<'a> {
recurse!(field_access.target()),
token!(field_access.field(), TokenKind::Word(None))
],
- Expr::Let(let_binding) => merge![
+ Expr::LetBinding(let_binding) => merge![
match let_binding.kind() {
LetBindingKind::Normal(pattern) => self.parse_pattern(pattern, offset),
LetBindingKind::Closure(ident) => self.parse_ident(ident, offset),
},
let_binding.init().and_then(|e| recurse!(e))
],
- Expr::DestructAssign(destruct_assignment) => {
+ Expr::DestructAssignment(destruct_assignment) => {
recurse!(destruct_assignment.value())
}
- Expr::Set(set_rule) => merge![
+ Expr::SetRule(set_rule) => merge![
recurse!(set_rule.target()),
set_rule.condition().and_then(|expr| recurse!(expr)),
parse_args(&mut set_rule.args().items())
],
- Expr::Show(show_rule) => merge![
+ Expr::ShowRule(show_rule) => merge![
recurse!(show_rule.transform()),
show_rule.selector().and_then(|expr| recurse!(expr))
],
@@ -425,9 +426,9 @@ impl<'a> TypstTranslator<'a> {
recurse!(conditional.condition(), conditional.if_body()),
conditional.else_body().and_then(|expr| recurse!(expr))
],
- Expr::While(while_loop) => recurse!(while_loop.condition(), while_loop.body()),
- Expr::For(for_loop) => recurse!(for_loop.iterable(), for_loop.body()),
- Expr::Code(code) => iter_recurse(&mut code.body().exprs()),
+ Expr::WhileLoop(while_loop) => recurse!(while_loop.condition(), while_loop.body()),
+ Expr::ForLoop(for_loop) => recurse!(for_loop.iterable(), for_loop.body()),
+ Expr::CodeBlock(code) => iter_recurse(&mut code.body().exprs()),
Expr::Closure(closure) => merge![
closure
.name()