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

Don't ruin links by markdown parsing. 

Fixes #3851.
This commit is contained in:
John Preston 2017-12-18 20:49:40 +04:00
parent 3f751bfbb0
commit afe9d38c48
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Telegram/SourceFiles/ui/text/text_entity.cpp
View File

@ -1646,7 +1646,10 @@ void AdjustMarkdownPrePart(MarkdownPart &result, const TextWithEntities &text, b
result.addNewlineAfter = (result.outerEnd < length && !chIsNewline(*(start + result.outerEnd))); result.addNewlineAfter = (result.outerEnd < length && !chIsNewline(*(start + result.outerEnd)));
} }
void ParseMarkdown(TextWithEntities &result, bool rich) { void ParseMarkdown(
TextWithEntities &result,
const EntitiesInText &linkEntities,
bool rich) {
if (result.empty()) { if (result.empty()) {
return; return;
} }
@ -1707,7 +1710,13 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
} }
// Check if start sequence intersects a command. // Check if start sequence intersects a command.
auto inCommand = checkTagStartInCommand(start, length, part.outerStart, nextCommandOffset, commandIsLink, inLink); auto inCommand = checkTagStartInCommand(
start,
length,
part.outerStart,
nextCommandOffset,
commandIsLink,
inLink);
if (inCommand || inLink) { if (inCommand || inLink) {
matchFromOffset = nextCommandOffset; matchFromOffset = nextCommandOffset;
continue; continue;
@ -1722,6 +1731,19 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
break; break;
} }
} }
// Check if any of sequence outer edges are inside a link.
for_const (auto &entity, linkEntities) {
const auto startIntersects = (part.outerStart >= entity.offset())
&& (part.outerStart < entity.offset() + entity.length());
const auto endIntersects = (part.outerEnd > entity.offset())
&& (part.outerEnd <= entity.offset() + entity.length());
if (startIntersects || endIntersects) {
intersectedEntityEnd = entity.offset() + entity.length();
break;
}
}
if (intersectedEntityEnd > 0) { if (intersectedEntityEnd > 0) {
matchFromOffset = qMax(part.innerStart, intersectedEntityEnd); matchFromOffset = qMax(part.innerStart, intersectedEntityEnd);
continue; continue;
@ -1772,7 +1794,9 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
// Some code is duplicated in flattextarea.cpp! // Some code is duplicated in flattextarea.cpp!
void ParseEntities(TextWithEntities &result, int32 flags, bool rich) { void ParseEntities(TextWithEntities &result, int32 flags, bool rich) {
if (flags & TextParseMarkdown) { // parse markdown entities (bold, italic, code and pre) if (flags & TextParseMarkdown) { // parse markdown entities (bold, italic, code and pre)
ParseMarkdown(result, rich); auto copy = TextWithEntities{ result.text, EntitiesInText() };
ParseEntities(copy, TextParseLinks, false);
ParseMarkdown(result, copy.entities, rich);
} }
auto newEntities = EntitiesInText(); auto newEntities = EntitiesInText();