kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix links parsing in case of surrogate pairs.

Browse source
This commit is contained in:
John Preston 2020-10-30 16:08:03 +03:00
parent 109375453e
commit 54a8c62bf5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/text/text_entity.cpp
View file

@ -1587,7 +1587,8 @@ void ParseEntities(TextWithEntities &result, int32 flags, bool rich) {
int32 len = result.text.size(), commandOffset = rich ? 0 : len; int32 len = result.text.size(), commandOffset = rich ? 0 : len;
bool inLink = false, commandIsLink = false; bool inLink = false, commandIsLink = false;
const QChar *start = result.text.constData(), *end = start + result.text.size(); const auto start = result.text.constData();
const auto end = start + result.text.size();
for (int32 offset = 0, matchOffset = offset, mentionSkip = 0; offset < len;) { for (int32 offset = 0, matchOffset = offset, mentionSkip = 0; offset < len;) {
if (commandOffset <= offset) { if (commandOffset <= offset) {
for (commandOffset = offset; commandOffset < len; ++commandOffset) { for (commandOffset = offset; commandOffset < len; ++commandOffset) {
@ -1642,6 +1643,10 @@ void ParseEntities(TextWithEntities &result, int32 flags, bool rich) {
} }
if (!(start + mentionStart + 1)->isLetter() || !(start + mentionEnd - 1)->isLetterOrNumber()) { if (!(start + mentionStart + 1)->isLetter() || !(start + mentionEnd - 1)->isLetterOrNumber()) {
mentionSkip = mentionEnd; mentionSkip = mentionEnd;
if (mentionSkip < len
&& (start + mentionSkip)->isLowSurrogate()) {
++mentionSkip;
}
mMention = RegExpMention().match(result.text, qMax(mentionSkip, matchOffset)); mMention = RegExpMention().match(result.text, qMax(mentionSkip, matchOffset));
if (mMention.hasMatch()) { if (mMention.hasMatch()) {
mentionStart = mMention.capturedStart(); mentionStart = mMention.capturedStart();