aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2022-03-17 01:52:14 +0000
committerBlaž Hrastnik2022-03-17 01:53:50 +0000
commit2376fc875e659dfce952c0b885e369b4295ba441 (patch)
treea8cf97a4bc098015d24e4b3416594c420b18a907
parent16e2b2e36b8e9d8516178ec7e8a3da8962ea5b35 (diff)
Temporarily turn on unicode-lines
Ropey's non-unicode lines impl has some bugs still
-rw-r--r--helix-core/Cargo.toml1
-rw-r--r--helix-core/src/chars.rs5
-rw-r--r--helix-term/Cargo.toml2
3 files changed, 7 insertions, 1 deletions
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 050bc8ab..20bc6fb8 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -11,6 +11,7 @@ homepage = "https://helix-editor.com"
include = ["src/**/*", "README.md"]
[features]
+default = ["unicode-lines"]
unicode-lines = ["ropey/unicode_lines"]
[dependencies]
diff --git a/helix-core/src/chars.rs b/helix-core/src/chars.rs
index 54991574..817bbb86 100644
--- a/helix-core/src/chars.rs
+++ b/helix-core/src/chars.rs
@@ -91,7 +91,10 @@ mod test {
#[test]
fn test_categorize() {
- const EOL_TEST_CASE: &str = "\n\r\u{000B}\u{000C}\u{0085}\u{2028}\u{2029}";
+ #[cfg(not(feature = "unicode-lines"))]
+ const EOL_TEST_CASE: &str = "\n";
+ #[cfg(feature = "unicode-lines")]
+ const EOL_TEST_CASE: &str = "\n\u{000B}\u{000C}\u{0085}\u{2028}\u{2029}";
const WORD_TEST_CASE: &str = "_hello_world_あいうえおー12345678901234567890";
const PUNCTUATION_TEST_CASE: &str =
"!\"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~!”#$%&’()*+、。:;<=>?@「」^`{|}~";
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 48365743..6a4d8285 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -16,6 +16,8 @@ build = true
app = true
[features]
+default = ["unicode-lines"]
+unicode-lines = ["helix-core/unicode-lines"]
[[bin]]
name = "hx"