Proper graphme truncation for windows-style newline

helix-editor · Nov 19, 2024 · 76ebd23 · 76ebd23
1 parent ef24853
commit 76ebd23
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/matcher/src/chars.rs b/matcher/src/chars.rs
@@ -189,10 +189,14 @@ pub(crate) enum CharClass {
 pub fn graphemes(text: &str) -> impl Iterator<Item = char> + '_ {
     #[cfg(feature = "unicode-segmentation")]
     let res = text.graphemes(true).map(|grapheme| {
-        grapheme
-            .chars()
-            .next()
-            .expect("graphemes must be non-empty")
+        if grapheme == "\r\n" {
+            '\n'
+        } else {
+            grapheme
+                .chars()
+                .next()
+                .expect("graphemes must be non-empty")
+        }
     });
     #[cfg(not(feature = "unicode-segmentation"))]
     let res = text.chars();