ui: word break with grapheme length, not bytes

​#69 East characters are not working.

1 files changed, 27 insertions, 19 deletions

diff --git a/ui/src/terminal/grapheme_clusters.rs b/ui/src/terminal/grapheme_clusters.rs
index 4e661c9b..2135ce8f 100644
--- a/ui/src/terminal/grapheme_clusters.rs
+++ b/ui/src/terminal/grapheme_clusters.rs
@@ -8,34 +8,42 @@
 
 */
 
-use super::wcwidth::{wcwidth, CodePointsIter};
 use super::*;
 
-pub fn split_graphemes(s: &str) -> Vec<&str> {
-    UnicodeSegmentation::graphemes(s, true).collect::<Vec<&str>>()
-}
 
-pub fn next_grapheme(s: &str) -> Option<(usize, &str)> {
-    UnicodeSegmentation::grapheme_indices(s, true).next()
-}
+pub trait Graphemes: UnicodeSegmentation + CodePointsIter {
+    fn split_graphemes<'a>(&'a self) -> Vec<&'a str> {
+        UnicodeSegmentation::graphemes(self, true).collect::<Vec<&str>>()
+    }
 
-pub fn last_grapheme(s: &str) -> Option<(usize, &str)> {
-    UnicodeSegmentation::grapheme_indices(s, true).next_back()
-}
+    fn graphemes_indices<'a>(&'a self) -> Vec<(usize, &'a str)> {
+        UnicodeSegmentation::grapheme_indices(self, true).collect::<Vec<(usize, &str)>>()
+    }
 
-pub fn grapheme_width(grapheme: &str) -> i32 {
-    let mut count = 0;
-    for c in grapheme.code_points() {
-        count += if let Some(c) = wcwidth(c) {
-            c as i32
-        } else {
-            -1
-        };
+    fn next_grapheme<'a>(&'a self) -> Option<(usize, &'a str)> {
+        UnicodeSegmentation::grapheme_indices(self, true).next()
     }
 
-    count
+    fn last_grapheme<'a>(&'a self) -> Option<(usize, &'a str)> {
+        UnicodeSegmentation::grapheme_indices(self, true).next_back()
+    }
+
+    fn grapheme_width(&self) -> i32 {
+        let mut count = 0;
+        for c in self.code_points() {
+            count += if let Some(c) = wcwidth(c) {
+                c as i32
+            } else {
+                -1
+            };
+        }
+
+        count
+    }
 }
 
+impl Graphemes for str {}
+
 //#[derive(PartialEq)]
 //enum Property {
 //    CR,