Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

chore: bump tree-sitter-highlight from 0.26.13 to 0.27.0 (#4029)

dependabot[bot]952e205798b6
diff --git a/Cargo.lock b/Cargo.lock
index 62b8b82c7..38dc3ee6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -408,12 +408,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.54"
+version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
+checksum = "005ec2760ca554fae18df7a11195552ec576cd665632a881bc011d5bb2fd4d80"
dependencies = [
"find-msvc-tools",
- "shlex 1.3.0",
+ "shlex",
]
[[package]]
@@ -512,7 +512,7 @@ dependencies = [
"clap",
"clap_lex",
"is_executable",
- "shlex 2.0.1",
+ "shlex",
]
[[package]]
@@ -1199,9 +1199,9 @@ dependencies = [
[[package]]
name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d"
[[package]]
name = "finl_unicode"
@@ -3219,12 +3219,6 @@ dependencies = [
"dirs 6.0.0",
]
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
[[package]]
name = "shlex"
version = "2.0.1"
@@ -3881,13 +3875,12 @@ dependencies = [
[[package]]
name = "tree-sitter"
-version = "0.26.13"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ebdd3a5a7e28a1890b876fdbd0c3c0fe0a6336cffaa104f11b9f720c9daa29"
+checksum = "2038684e0058edba0d17302619f62eabce4a8e11c6ac59506996a8d79848851d"
dependencies = [
"cc",
"regex",
- "regex-syntax",
"serde_json",
"streaming-iterator",
"tree-sitter-language",
@@ -3905,9 +3898,9 @@ dependencies = [
[[package]]
name = "tree-sitter-highlight"
-version = "0.26.13"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662316ecd27166f79e18865429638c05194aee76a7bc374136d844f05d778f74"
+checksum = "fa86266a9dc1aae627034551d45e84427a45c70914a8629608ed1bd093214c28"
dependencies = [
"regex",
"streaming-iterator",
@@ -3917,9 +3910,9 @@ dependencies = [
[[package]]
name = "tree-sitter-language"
-version = "0.1.6"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce"
+checksum = "ca0d1bf6fdd806e43ae5198f82f527056d359def39e54e67a0f478ac09dac081"
[[package]]
name = "tree_magic_mini"
diff --git a/Cargo.toml b/Cargo.toml
index f1edcb640..67a486f46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -199,7 +199,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
minijinja = { version = "2.20", default-features = false, features = ["builtins", "serde", "std_collections"] }
rayon = "1.12"
serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.145"
+serde_json = "1.0.150"
shell-escape = "0.1"
shellexpand = "3.1"
strsim = "0.11.1"
@@ -209,11 +209,11 @@ terminal_size = "0.4.3"
toml = { version = "1.0", features = ["preserve_order"] }
toml_edit = { version = "0.25", features = ["serde"] }
# tree-sitter-bash may lag behind tree-sitter-highlight (0.25.x works with
-# tree-sitter-highlight 0.26.x).
+# tree-sitter-highlight 0.27.x).
# These are optional dependencies controlled by the "syntax-highlighting" feature.
# To build without C compilation requirements, use: cargo install worktrunk --no-default-features --features cli
tree-sitter-bash = { version = "0.25.1", optional = true }
-tree-sitter-highlight = { version = "0.26", optional = true }
+tree-sitter-highlight = { version = "0.27", optional = true }
unicode-width = "0.2.1"
wrap-ansi = "0.1"
osc8 = "0.1.0"
diff --git a/src/styling/format.rs b/src/styling/format.rs
index 604c5258d..f5de5b0b2 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -343,7 +343,13 @@ fn format_bash_with_gutter_impl(
let mut highlighter = Highlighter::new();
let highlights = highlighter
- .highlight(&config, content.as_bytes(), None, |_| None)
+ .highlight(
+ &config,
+ content.as_bytes(),
+ None, // encoding: None = UTF-8
+ None, // cancellation flag
+ |_| None,
+ )
.expect("highlighting valid UTF-8 should not fail");
let content_bytes = content.as_bytes();
@@ -716,7 +722,7 @@ mod tests {
let mut output = String::new();
let highlights = highlighter
- .highlight(&config, cmd.as_bytes(), None, |_| None)
+ .highlight(&config, cmd.as_bytes(), None, None, |_| None)
.unwrap();
for event in highlights {
match event.unwrap() {
@@ -772,7 +778,7 @@ mod tests {
let mut output = String::new();
let highlights = highlighter
- .highlight(&config, cmd.as_bytes(), None, |_| None)
+ .highlight(&config, cmd.as_bytes(), None, None, |_| None)
.unwrap();
for event in highlights {
match event.unwrap() {
diff --git a/tests/helpers/wt-perf/Cargo.toml b/tests/helpers/wt-perf/Cargo.toml
index 25aa1a513..733ea1ea2 100644
--- a/tests/helpers/wt-perf/Cargo.toml
+++ b/tests/helpers/wt-perf/Cargo.toml
@@ -32,7 +32,7 @@ worktrunk = { path = "../../..", default-features = false }
# For parsing cargo's --message-format=json artifact report (resolve_wt_binary);
# also used by the CLI tests.
-serde_json = "1.0.145"
+serde_json = "1.0.150"
[lib]
name = "wt_perf"