From 4e4e13a98359f528576d422f019c946858c06570 Mon Sep 17 00:00:00 2001
From: Vivek Tiwari <vivek120303@gmail.com>
Date: Thu, 13 Mar 2025 18:36:19 +0530
Subject: [PATCH] Implemented locale-aware sorting for mention auto completion

---
 lib/model/autocomplete.dart | 15 +++++++++++----
 pubspec.lock                |  8 ++++++++
 pubspec.yaml                |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/model/autocomplete.dart b/lib/model/autocomplete.dart
index 073255bc9d..fa34c88fb6 100644
--- a/lib/model/autocomplete.dart
+++ b/lib/model/autocomplete.dart
@@ -1,7 +1,8 @@
 import 'dart:math';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
+import 'package:diacritic/diacritic.dart'; // Helps remove accents for better sorting
+import 'package:flutter/widgets.dart'; // For Localizations.localeOf()
 
 import '../api/model/events.dart';
 import '../api/model/model.dart';
@@ -466,7 +467,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
   /// particularly because [List.sort] makes no guarantees about the order
   /// of items that compare equal.
   int debugCompareUsers(User userA, User userB) {
-    return _comparator(store: store, narrow: narrow)(userA, userB);
+    return _comparator(store: store, narrow: narrow,)(userA, userB);
   }
 
   static int Function(User, User) _comparator({
@@ -599,7 +600,13 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
       .normalizedNameForUser(userA);
     final userBName = store.autocompleteViewManager.autocompleteDataCache
       .normalizedNameForUser(userB);
-    return userAName.compareTo(userBName); // TODO(i18n): add locale-aware sorting
+
+    final normalizedA = removeDiacritics(userAName);
+    final normalizeB = removeDiacritics(userBName);
+
+    return normalizedA.compareTo(normalizeB);
+
+    // return userAName.compareTo(userBName); // TODO(i18n): add locale-aware sorting
   }
 
   void computeWildcardMentionResults({
@@ -744,7 +751,7 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {
     required Narrow narrow,
   }) {
     return MentionAutocompleteView.init(
-      store: store, localizations: localizations, narrow: narrow, query: this);
+      store: store, localizations: localizations, narrow: narrow, query: this,);
   }
 
   bool testWildcardOption(WildcardMentionOption wildcardOption, {
diff --git a/pubspec.lock b/pubspec.lock
index 2a9993093f..ddb7fb75e5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -266,6 +266,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.2"
+  diacritic:
+    dependency: "direct main"
+    description:
+      name: diacritic
+      sha256: "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   drift:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 82d4fa495a..67dce4131c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,6 +62,7 @@ dependencies:
   url_launcher_android: ">=6.1.0"
   video_player: ^2.8.3
   wakelock_plus: ^1.2.8
+  diacritic: ^0.1.6
   zulip_plugin:
     path: ./packages/zulip_plugin
   # Keep list sorted when adding dependencies; it helps prevent merge conflicts.