Skip to content

Commit 21c4a73

Browse files
committed
autocomplete[nfc]: Move down computeResults for a more logical order
1 parent 9a61916 commit 21c4a73

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

lib/model/autocomplete.dart

+20-17
Original file line numberDiff line numberDiff line change
@@ -439,23 +439,6 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
439439
final Narrow narrow;
440440
final List<User> sortedUsers;
441441

442-
@override
443-
Future<List<MentionAutocompleteResult>?> computeResults() async {
444-
final results = <MentionAutocompleteResult>[];
445-
if (await filterCandidates(filter: _testUser,
446-
candidates: sortedUsers, results: results)) {
447-
return null;
448-
}
449-
return results;
450-
}
451-
452-
MentionAutocompleteResult? _testUser(MentionAutocompleteQuery query, User user) {
453-
if (query.testUser(user, store.autocompleteViewManager.autocompleteDataCache)) {
454-
return UserMentionAutocompleteResult(userId: user.userId);
455-
}
456-
return null;
457-
}
458-
459442
static List<User> _usersByRelevance({
460443
required PerAccountStore store,
461444
required Narrow narrow,
@@ -615,6 +598,26 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
615598
return userAName.compareTo(userBName); // TODO(i18n): add locale-aware sorting
616599
}
617600

601+
@override
602+
Future<List<MentionAutocompleteResult>?> computeResults() async {
603+
final results = <MentionAutocompleteResult>[];
604+
// Give priority to wildcard mentions.
605+
results.addAll(wildcardMentionResults);
606+
607+
if (await filterCandidates(filter: _testUser,
608+
candidates: sortedUsers, results: results)) {
609+
return null;
610+
}
611+
return results;
612+
}
613+
614+
MentionAutocompleteResult? _testUser(MentionAutocompleteQuery query, User user) {
615+
if (query.testUser(user, store.autocompleteViewManager.autocompleteDataCache)) {
616+
return UserMentionAutocompleteResult(userId: user.userId);
617+
}
618+
return null;
619+
}
620+
618621
@override
619622
void dispose() {
620623
store.autocompleteViewManager.unregisterMentionAutocomplete(this);

0 commit comments

Comments
 (0)