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

When sorting completions, use matched string, not entire query 

Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.
pull/21833/head
Luke Barnard 2017-08-02 10:09:00 +01:00
parent b632c9132c
commit 72c1cf9288
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)); completions = completions.concat(this.nameMatcher.match(matchedString));
const sorters = []; const sorters = [];
// First, sort by score (Infinity if query not in shortname) // First, sort by score (Infinity if matchedString not in shortname)
sorters.push((c) => score(query, c.shortname)); sorters.push((c) => score(matchedString, c.shortname));
// If the query is not empty, sort by length of shortname. Example: // If the matchedString is not empty, sort by length of shortname. Example:
// query = ":bookmark" // matchedString = ":bookmark"
// completions = [":bookmark:", ":bookmark_tabs:", ...] // completions = [":bookmark:", ":bookmark_tabs:", ...]
if (query.length > 1) { if (matchedString.length > 1) {
sorters.push((c) => c.shortname.length); sorters.push((c) => c.shortname.length);
} }
// Finally, sort by original ordering // 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), displayedAlias: getDisplayAliasForRoom(room),
}; };
})); }));
completions = this.matcher.match(command[0]); const matchedString = command[0];
completions = this.matcher.match(matchedString);
completions = _sortBy(completions, [ completions = _sortBy(completions, [
(c) => score(query, c.displayedAlias), (c) => score(matchedString, c.displayedAlias),
(c) => c.displayedAlias.length, (c) => c.displayedAlias.length,
]).map((room) => { ]).map((room) => {
const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId; const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId;