xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix markup parsing handling of antislash escapes

Browse Source 
Antislashes did not need to immediately precede a face spec to
escape it, it could be in any characters before it.
This commit is contained in:
Maxime Coste 2016-12-07 13:43:27 +00:00
parent 2f704eab16
commit 1383614a5f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/display_buffer.cc
View File

@ -316,8 +316,14 @@ DisplayLine parse_display_line(StringView line)
it = closing; it = closing;
pos = closing + 1; pos = closing + 1;
} }
was_antislash = false;
} }
if (c == '\n') // line breaks are forbidden, replace with space
{
content += StringView{pos, it+1};
content.back() = ' ';
pos = it + 1;
}
if (c == '\\') if (c == '\\')
{ {
if (was_antislash) if (was_antislash)
@ -329,14 +335,9 @@ DisplayLine parse_display_line(StringView line)
else else
was_antislash = true; was_antislash = true;
} }
if (c == '\n') // line breaks are forbidden, replace with space else
{
content += StringView{pos, it+1};
content.back() = ' ';
pos = it + 1;
was_antislash = false; was_antislash = false;
} }
}
content += StringView{pos, line.end()}; content += StringView{pos, line.end()};
if (not content.empty()) if (not content.empty())
res.push_back({std::move(content), face}); res.push_back({std::move(content), face});