@@ -610,11 +610,10 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
610610 if (query.silent) return ;
611611
612612 bool tryOption (WildcardMentionOption option) {
613- if (query.testWildcardOption (option, localizations: localizations)) {
614- results.add (WildcardMentionAutocompleteResult (wildcardOption: option));
615- return true ;
616- }
617- return false ;
613+ final result = query.testWildcardOption (option, localizations: localizations);
614+ if (result == null ) return false ;
615+ results.add (result);
616+ return true ;
618617 }
619618
620619 // Only one of the (all, everyone, channel, stream) channel wildcards are
@@ -745,11 +744,13 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {
745744 store: store, localizations: localizations, narrow: narrow, query: this );
746745 }
747746
748- bool testWildcardOption (WildcardMentionOption wildcardOption, {
747+ WildcardMentionAutocompleteResult ? testWildcardOption (WildcardMentionOption wildcardOption, {
749748 required ZulipLocalizations localizations}) {
750749 // TODO(#237): match insensitively to diacritics
751- return wildcardOption.canonicalString.contains (_lowercase)
750+ final matches = wildcardOption.canonicalString.contains (_lowercase)
752751 || wildcardOption.localizedCanonicalString (localizations).contains (_lowercase);
752+ if (! matches) return null ;
753+ return WildcardMentionAutocompleteResult (wildcardOption: wildcardOption);
753754 }
754755
755756 MentionAutocompleteResult ? testUser (User user, AutocompleteDataCache cache, UserStore store) {
0 commit comments