From 17ffa38a5a4e69cde5324765d1565499e515265b Mon Sep 17 00:00:00 2001
From: rhogenson <05huvhec@duck.com>
Date: Sat, 1 Feb 2025 15:09:45 -0800
Subject: [PATCH] Use the first char in a grapheme for classification (#12483)

Co-authored-by: Rose Hogenson <rosehogenson@posteo.net>
---
 helix-core/src/doc_formatter/test.rs | 8 ++++++++
 helix-core/src/graphemes.rs          | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/helix-core/src/doc_formatter/test.rs b/helix-core/src/doc_formatter/test.rs
index 415ce8f6a..21be2e535 100644
--- a/helix-core/src/doc_formatter/test.rs
+++ b/helix-core/src/doc_formatter/test.rs
@@ -102,6 +102,14 @@ fn long_word_softwrap() {
     );
 }
 
+#[test]
+fn softwrap_multichar_grapheme() {
+    assert_eq!(
+        softwrap_text("xxxx xxxx xxx a\u{0301}bc\n"),
+        "xxxx xxxx xxx \n.ábc \n "
+    )
+}
+
 fn softwrap_text_at_text_width(text: &str) -> String {
     let mut text_fmt = TextFormat::new_test(true);
     text_fmt.soft_wrap_at_text_width = true;
diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs
index e6adeee95..33d237cb9 100644
--- a/helix-core/src/graphemes.rs
+++ b/helix-core/src/graphemes.rs
@@ -64,7 +64,7 @@ impl<'a> Grapheme<'a> {
     }
 
     pub fn is_whitespace(&self) -> bool {
-        !matches!(&self, Grapheme::Other { g } if !g.chars().all(char_is_whitespace))
+        !matches!(&self, Grapheme::Other { g } if !g.chars().next().is_some_and(char_is_whitespace))
     }
 
     // TODO currently word boundaries are used for softwrapping.
@@ -72,7 +72,7 @@ impl<'a> Grapheme<'a> {
     // This could however be improved in the future by considering unicode
     // character classes but
     pub fn is_word_boundary(&self) -> bool {
-        !matches!(&self, Grapheme::Other { g,.. } if g.chars().all(char_is_word))
+        !matches!(&self, Grapheme::Other { g,.. } if g.chars().next().is_some_and(char_is_word))
     }
 }