anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve message markup parsing

Browse source
This commit is contained in:
fiaxh 2018-12-28 15:04:50 +01:00
parent 49269c3173
commit 5a4e509359
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main/src/ui/util/helper.vala
View file

@ -200,14 +200,13 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa
string[] convenience_tag = new string[]{"tt", "i", "b"}; string[] convenience_tag = new string[]{"tt", "i", "b"};
for (int i = 0; i < markup_string.length; i++) { for (int i = 0; i < markup_string.length; i++) {
Regex regex = new Regex(Regex.escape_string(markup_string[i]) + ".+" + Regex.escape_string(markup_string[i])); string markup_esc = Regex.escape_string(markup_string[i]);
Regex regex = new Regex("(^|\\s)" + markup_esc + "(\\S.*?\\S|\\S)" + markup_esc + "($|\\s)");
MatchInfo match_info; MatchInfo match_info;
regex.match(s.down(), 0, out match_info); regex.match(s.down(), 0, out match_info);
if (match_info.matches()) { if (match_info.matches()) {
int start, end; int start, end;
match_info.fetch_pos(0, out start, out end); match_info.fetch_pos(2, out start, out end);
start += markup_string[i].length;
end -= markup_string[i].length;
return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) + return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
@"<$(convenience_tag[i])>" + s[start:end] + @"</$(convenience_tag[i])>" + @"<$(convenience_tag[i])>" + s[start:end] + @"</$(convenience_tag[i])>" +
parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped); parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);