Improve EMOJI_CODEPOINT_COMPARATOR

felldo · Nov 14, 2023 · 3123e1d · 3123e1d
1 parent 8f336b6
commit 3123e1d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/src/main/java/net/fellbaum/jemoji/EmojiManager.java b/lib/src/main/java/net/fellbaum/jemoji/EmojiManager.java
@@ -31,8 +31,10 @@ public final class EmojiManager {
     private static final Pattern NOT_WANTED_EMOJI_CHARACTERS = Pattern.compile("[\\p{Alpha}\\p{Z}]");
 
     private static final Comparator<Emoji> EMOJI_CODEPOINT_COMPARATOR = (final Emoji o1, final Emoji o2) -> {
-        if (o1.getEmoji().codePoints().toArray().length == o2.getEmoji().codePoints().toArray().length) return 0;
-        return o1.getEmoji().codePoints().toArray().length > o2.getEmoji().codePoints().toArray().length ? -1 : 1;
+        final int codePointCount1 = getCodePointCount(o1.getEmoji());
+        final int codePointCount2 = getCodePointCount(o2.getEmoji());
+        if (codePointCount1 == codePointCount2) return 0;
+        return codePointCount1 > codePointCount2 ? -1 : 1;
     };
 
     static {
@@ -53,6 +55,10 @@ public final class EmojiManager {
         }
     }
 
+    private static int getCodePointCount(String string) {
+        return string.codePointCount(0, string.length());
+    }
+
     private static Collector<Emoji, ?, LinkedHashMap<Integer, List<Emoji>>> getEmojiLinkedHashMapCollector() {
         return Collectors.groupingBy(
                 emoji -> emoji.getEmoji().codePoints().toArray()[0],