OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1266 from matrix-org/luke/fix-ac-providers-sort 

When sorting completions, use matched string, not entire query
pull/21833/head
Luke Barnard 2017-08-02 10:36:47 +01:00 committed by GitHub
parent b632c9132c 72c1cf9288
commit 9010f96e60
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/autocomplete/EmojiProvider.js
View File

@ -115,12 +115,12 @@ export default class EmojiProvider extends AutocompleteProvider {
completions = completions.concat(this.nameMatcher.match(matchedString));
const sorters = [];
// First, sort by score (Infinity if query not in shortname)
sorters.push((c) => score(query, c.shortname));
// If the query is not empty, sort by length of shortname. Example:
// query = ":bookmark"
// First, sort by score (Infinity if matchedString not in shortname)
sorters.push((c) => score(matchedString, c.shortname));
// If the matchedString is not empty, sort by length of shortname. Example:
// matchedString = ":bookmark"
// completions = [":bookmark:", ":bookmark_tabs:", ...]
if (query.length > 1) {
if (matchedString.length > 1) {
sorters.push((c) => c.shortname.length);
}
// Finally, sort by original ordering

5
src/autocomplete/RoomProvider.js
View File

@ -63,9 +63,10 @@ export default class RoomProvider extends AutocompleteProvider {
displayedAlias: getDisplayAliasForRoom(room),
};
}));
completions = this.matcher.match(command[0]);
const matchedString = command[0];
completions = this.matcher.match(matchedString);
completions = _sortBy(completions, [
(c) => score(query, c.displayedAlias),
(c) => score(matchedString, c.displayedAlias),
(c) => c.displayedAlias.length,
]).map((room) => {
const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId;