StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor: allow newline|space to appear after multiline code seq

Browse Source 
Also added tests
This commit is contained in:
noavarice 2017-10-28 12:50:46 +03:00
parent acff6e0450
commit de108ce834
No known key found for this signature in database
GPG Key ID: 52A50775BE13DF17
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chatlog/textformatter.cpp
View File

@ -54,9 +54,9 @@ static const QString DOUBLE_SIGN_PATTERN = QStringLiteral("(?<=^|[\\s\\n])"
static const QString MULTILINE_CODE = QStringLiteral("(?<=^|[\\s\\n])" static const QString MULTILINE_CODE = QStringLiteral("(?<=^|[\\s\\n])"
"(```)" "(```)"
"(?![`\\s\\n])" "(?!`)"
"(.|\\n)+?" "(.|\\n)+?"
"(?<![`\\s\\n])" "(?<!`)"
"```" "```"
"(?=$|[\\s\\n])"); "(?=$|[\\s\\n])");

11
test/chatlog/textformatter_test.cpp
View File

@ -127,14 +127,19 @@ static const QVector<StringPair> MULTI_SIGN_WORK_CASES {
PAIR_FORMAT("%1int main()\n{ return 0;\n}%1", "%2%1" PAIR_FORMAT("%1int main()\n{ return 0;\n}%1", "%2%1"
"int main()\n{ return 0;\n}" "int main()\n{ return 0;\n}"
"%1%3"), "%1%3"),
// allows new line and spaces to go right after ``` sequence
PAIR_FORMAT("%1\nint main()\n{ return 0;\n}\n%1", "%2%1"
"\nint main()\n{ return 0;\n}\n"
"%1%3"),
PAIR_FORMAT("%1 int main()\n{ return 0;\n} %1", "%2%1"
" int main()\n{ return 0;\n} "
"%1%3"),
}; };
// any type of markdown must fail for this data // any type of markdown must fail for this data
static const QVector<QString> COMMON_EXCEPTIONS { static const QVector<QString> COMMON_EXCEPTIONS {
// No empty formatting string // No empty formatting string
QStringLiteral("%1%1"), QStringLiteral("%1%1"),
// Formatting text must not start/end with whitespace symbols
QStringLiteral("%1 %1"), QStringLiteral("%1 a%1"), QStringLiteral("%1a %1"),
// Formatting string must be enclosed by whitespace symbols, newlines or message start/end // Formatting string must be enclosed by whitespace symbols, newlines or message start/end
QStringLiteral("a%1aa%1a"), QStringLiteral("%1aa%1a"), QStringLiteral("a%1aa%1"), QStringLiteral("a%1aa%1a"), QStringLiteral("%1aa%1a"), QStringLiteral("a%1aa%1"),
QStringLiteral("a %1aa%1a"), QStringLiteral("a%1aa%1 a"), QStringLiteral("a %1aa%1a"), QStringLiteral("a%1aa%1 a"),
@ -142,6 +147,8 @@ static const QVector<QString> COMMON_EXCEPTIONS {
}; };
static const QVector<QString> SINGLE_AND_DOUBLE_SIGN_EXCEPTIONS { static const QVector<QString> SINGLE_AND_DOUBLE_SIGN_EXCEPTIONS {
// Formatting text must not start/end with whitespace symbols
QStringLiteral("%1 %1"), QStringLiteral("%1 a%1"), QStringLiteral("%1a %1"),
// No newlines // No newlines
QStringLiteral("%1\n%1"), QStringLiteral("%1aa\n%1"), QStringLiteral("%1\naa%1"), QStringLiteral("%1\n%1"), QStringLiteral("%1aa\n%1"), QStringLiteral("%1\naa%1"),
QStringLiteral("%1aa\naa%1"), QStringLiteral("%1aa\naa%1"),