TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Replace unicode-general-category with icu-properties (#10989)" (#11006)

Browse source 
This reverts commit 9b7dffbd61.
This commit is contained in:
Kirawi 2024-06-22 21:05:53 -04:00 • committed by GitHub
parent 9b7dffbd61
commit b55cb3aa11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -1319,7 +1319,6 @@ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
"helix-loader", "helix-loader",
"helix-stdx", "helix-stdx",
"icu_properties",
"imara-diff", "imara-diff",
"indoc", "indoc",
"log", "log",
@ -1337,6 +1336,7 @@ dependencies = [
"textwrap", "textwrap",
"toml", "toml",
"tree-sitter", "tree-sitter",
"unicode-general-category",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
] ]
@ -2664,6 +2664,12 @@ version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"
[[package]]
name = "unicode-general-category"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.8" version = "1.0.8"

2
helix-core/Cargo.toml
View file

@ -24,7 +24,7 @@ smallvec = "1.13"
smartstring = "1.0.1" smartstring = "1.0.1"
unicode-segmentation = "1.11" unicode-segmentation = "1.11"
unicode-width = "0.1" unicode-width = "0.1"
icu_properties = "1.5" unicode-general-category = "0.6"
slotmap.workspace = true slotmap.workspace = true
tree-sitter.workspace = true tree-sitter.workspace = true
once_cell = "1.19" once_cell = "1.19"

4
helix-core/src/chars.rs
View file

@ -63,10 +63,10 @@ pub fn char_is_whitespace(ch: char) -> bool {
#[inline] #[inline]
pub fn char_is_punctuation(ch: char) -> bool { pub fn char_is_punctuation(ch: char) -> bool {
use icu_properties::{maps::general_category, GeneralCategory}; use unicode_general_category::{get_general_category, GeneralCategory};
matches!( matches!(
general_category().get(ch), get_general_category(ch),
GeneralCategory::OtherPunctuation GeneralCategory::OtherPunctuation
| GeneralCategory::OpenPunctuation | GeneralCategory::OpenPunctuation
| GeneralCategory::ClosePunctuation | GeneralCategory::ClosePunctuation

2
helix-core/src/lib.rs
View file

@ -30,7 +30,7 @@ mod transaction;
pub mod wrap; pub mod wrap;
pub mod unicode { pub mod unicode {
pub use icu_properties as properties; pub use unicode_general_category as category;
pub use unicode_segmentation as segmentation; pub use unicode_segmentation as segmentation;
pub use unicode_width as width; pub use unicode_width as width;
} }