Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | Cargo.lock | 47 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | helix-core/Cargo.toml | 3 | ||||
| -rw-r--r-- | helix-stdx/Cargo.toml | 2 |
4 files changed, 41 insertions, 17 deletions
@@ -1417,13 +1417,14 @@ dependencies = [ "parking_lot", "quickcheck", "regex", - "regex-cursor", - "ropey", + "regex-cursor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "ropey 2.0.0-alpha.3", "serde", "serde_json", "slotmap", "smallvec", "smartstring", + "str_indices", "textwrap", "toml", "tree-house", @@ -1525,8 +1526,8 @@ dependencies = [ "etcetera", "once_cell", "regex-automata", - "regex-cursor", - "ropey", + "regex-cursor 0.1.5 (git+https://github.com/cessen/regex-cursor.git?branch=ropey2)", + "ropey 2.0.0-alpha.3", "rustix 1.0.7", "tempfile", "unicode-segmentation", @@ -2331,7 +2332,20 @@ dependencies = [ "memchr", "regex-automata", "regex-syntax", - "ropey", + "ropey 1.6.1", +] + +[[package]] +name = "regex-cursor" +version = "0.1.5" +source = "git+https://github.com/cessen/regex-cursor.git?branch=ropey2#7b8facc3b184da133f86f7c46de3d18d16708bcc" +dependencies = [ + "log", + "memchr", + "regex-automata", + "regex-syntax", + "ropey 1.6.1", + "ropey 2.0.0-alpha.3", ] [[package]] @@ -2351,6 +2365,15 @@ dependencies = [ ] [[package]] +name = "ropey" +version = "2.0.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a6bae11a8c92fe67ffe2817f38315372f113617978665635147fd5eb6b789c4" +dependencies = [ + "str_indices", +] + +[[package]] name = "rustc-demangle" version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2801,16 +2824,15 @@ checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" [[package]] name = "tree-house" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679e3296e503901cd9f6e116be5a43a9270222215bf6c78b4b1f4af5c3dcc62d" +source = "git+https://github.com/helix-editor/tree-house?branch=ropey2#d24f15c081faf4b78eb5c9161818f2aaeeaf64f1" dependencies = [ "arc-swap", "hashbrown 0.15.3", "kstring", "once_cell", "regex", - "regex-cursor", - "ropey", + "regex-cursor 0.1.5 (git+https://github.com/cessen/regex-cursor.git?branch=ropey2)", + "ropey 2.0.0-alpha.3", "slab", "tree-house-bindings", ] @@ -2818,13 +2840,12 @@ dependencies = [ [[package]] name = "tree-house-bindings" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690809022f44e3d2329882649724b6e0027ade3fada65e4631d303e744dc32b4" +source = "git+https://github.com/helix-editor/tree-house?branch=ropey2#d24f15c081faf4b78eb5c9161818f2aaeeaf64f1" dependencies = [ "cc", "libloading", - "regex-cursor", - "ropey", + "regex-cursor 0.1.5 (git+https://github.com/cessen/regex-cursor.git?branch=ropey2)", + "ropey 2.0.0-alpha.3", "thiserror 2.0.12", ] @@ -37,16 +37,18 @@ package.helix-tui.opt-level = 2 package.helix-term.opt-level = 2 [workspace.dependencies] -tree-house = { version = "0.2.0", default-features = false } +tree-house = { git = "https://github.com/helix-editor/tree-house", branch = "ropey2", default-features = false } nucleo = "0.5.0" slotmap = "1.0.7" thiserror = "2.0" tempfile = "3.20.0" bitflags = "2.9" unicode-segmentation = "1.2" -ropey = { version = "1.6.1", default-features = false, features = ["simd"] } +ropey = { version = "2.0.0-alpha.3", default-features = false, features = ["metric_chars", "metric_utf16", "metric_lines_lf_cr"] } +str_indices = "0.4" foldhash = "0.1" parking_lot = "0.12" +regex-cursor = { git = "https://github.com/cessen/regex-cursor.git", branch = "ropey2", features = ["ropey2"] } [workspace.package] version = "25.1.1" diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml index b0520761..c2f9d511 100644 --- a/helix-core/Cargo.toml +++ b/helix-core/Cargo.toml @@ -12,7 +12,7 @@ repository.workspace = true homepage.workspace = true [features] -unicode-lines = ["ropey/unicode_lines"] +unicode-lines = ["ropey/metric_lines_unicode"] integration = [] [dependencies] @@ -21,6 +21,7 @@ helix-loader = { path = "../helix-loader" } helix-parsec = { path = "../helix-parsec" } ropey.workspace = true +str_indices.workspace = true smallvec = "1.15" smartstring = "1.0.1" unicode-segmentation.workspace = true diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml index a41dee83..c13b94ff 100644 --- a/helix-stdx/Cargo.toml +++ b/helix-stdx/Cargo.toml @@ -16,7 +16,7 @@ dunce = "1.0" etcetera = "0.10" ropey.workspace = true which = "7.0" -regex-cursor = "0.1.5" +regex-cursor.workspace = true bitflags.workspace = true once_cell = "1.21" regex-automata = "0.4.9" |