procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve case-insensitive emoji suggestions.

This commit is contained in:
John Preston 2018-03-15 02:10:03 +03:00
parent c5e6bfce95
commit b6e7625016
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
View File

@ -401,7 +401,7 @@ QString SuggestionsController::getEmojiQuery() {
} }
position -= from; position -= from;
_queryStartPosition = from; _queryStartPosition = from;
return fragment.text().toLower(); return fragment.text();
} }
return QString(); return QString();
}; };
@ -411,10 +411,18 @@ QString SuggestionsController::getEmojiQuery() {
return QString(); return QString();
} }
auto isSuggestionChar = [](QChar ch) { const auto isUpperCaseLetter = [](QChar ch) {
return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || (ch == '_') || (ch == '-') || (ch == '+'); return (ch >= 'A' && ch <= 'Z');
}; };
auto isGoodCharBeforeSuggestion = [isSuggestionChar](QChar ch) { const auto isSuggestionChar = [](QChar ch) {
return (ch >= 'a' && ch <= 'z')
|| (ch >= 'A' && ch <= 'Z')
|| (ch >= '0' && ch <= '9')
|| (ch == '_')
|| (ch == '-')
|| (ch == '+');
};
const auto isGoodCharBeforeSuggestion = [&](QChar ch) {
return !isSuggestionChar(ch) || (ch == 0); return !isSuggestionChar(ch) || (ch == 0);
}; };
Assert(position > 0 && position <= text.size()); Assert(position > 0 && position <= text.size());
@ -427,7 +435,14 @@ QString SuggestionsController::getEmojiQuery() {
if (position > i + 1) { if (position > i + 1) {
// Skip colon and the first letter. // Skip colon and the first letter.
_queryStartPosition += i + 2; _queryStartPosition += i + 2;
return text.mid(i, position - i); const auto length = position - i;
auto result = text.mid(i, length);
if (length == 2 && isUpperCaseLetter(text[1])) {
// No upper case single letter suggestions.
// We don't want to suggest emoji on :D and :P
return QString();
}
return result.toLower();
} }
} }
return QString(); return QString();