From 6c43c2a7bfaab8c9c0084f2d06d13b6b0ca76863 Mon Sep 17 00:00:00 2001 From: mo8it Date: Sun, 25 Feb 2024 14:36:29 +0100 Subject: [PATCH] Add globset to helix-term --- Cargo.lock | 1 + Cargo.toml | 1 + helix-core/Cargo.toml | 2 +- helix-lsp/Cargo.toml | 2 +- helix-term/Cargo.toml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1662c949e..f7d14270a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1360,6 +1360,7 @@ dependencies = [ "crossterm", "fern", "futures-util", + "globset", "grep-regex", "grep-searcher", "helix-core", diff --git a/Cargo.toml b/Cargo.toml index ff750b0a6..64e33d731 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,7 @@ package.helix-term.opt-level = 2 tree-sitter = { version = "0.20", git = "https://github.com/helix-editor/tree-sitter", rev = "660481dbf71413eba5a928b0b0ab8da50c1109e0" } nucleo = "0.2.0" ignore = "0.4" +globset = "0.4.14" [workspace.package] version = "23.10.0" diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml index 0b0dd7452..6e29e8c48 100644 --- a/helix-core/Cargo.toml +++ b/helix-core/Cargo.toml @@ -52,7 +52,7 @@ textwrap = "0.16.1" nucleo.workspace = true parking_lot = "0.12" -globset = "0.4.14" +globset.workspace = true [dev-dependencies] quickcheck = { version = "1", default-features = false } diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml index 4284b0520..5995cab59 100644 --- a/helix-lsp/Cargo.toml +++ b/helix-lsp/Cargo.toml @@ -21,7 +21,7 @@ helix-parsec = { path = "../helix-parsec" } anyhow = "1.0" futures-executor = "0.3" futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false } -globset = "0.4.14" +globset.workspace = true log = "0.4" lsp-types = { version = "0.95" } serde = { version = "1.0", features = ["derive"] } diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index 854863094..3f3596020 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -72,6 +72,7 @@ grep-regex = "0.1.12" grep-searcher = "0.1.13" [target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100 +globset.workspace = true signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] } libc = "0.2.153"