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

more robust implementation of expand_unprintable

Browse Source
This commit is contained in:
Maxime Coste 2013-03-18 23:35:23 +01:00
parent d3f586f378
commit 6907fcf76e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/highlighters.cc
View File

@ -282,12 +282,12 @@ void expand_unprintable(DisplayBuffer& display_buffer)
{ {
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
{ {
for (auto& atom : line) for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
{ {
if (atom.content.type() == AtomContent::BufferRange) if (atom_it->content.type() == AtomContent::BufferRange)
{ {
using Utf8It = utf8::utf8_iterator<BufferIterator>; using Utf8It = utf8::utf8_iterator<BufferIterator, utf8::InvalidBytePolicy::Pass>;
for (Utf8It it = atom.content.begin(), end = atom.content.end(); it != end; ++it) for (Utf8It it = atom_it->content.begin(), end = atom_it->content.end(); it != end; ++it)
{ {
Codepoint cp = *it; Codepoint cp = *it;
if (cp != '\n' and not std::isprint((wchar_t)cp, std::locale())) if (cp != '\n' and not std::isprint((wchar_t)cp, std::locale()))
@ -295,10 +295,13 @@ void expand_unprintable(DisplayBuffer& display_buffer)
std::ostringstream oss; std::ostringstream oss;
oss << "U+" << std::hex << cp; oss << "U+" << std::hex << cp;
String str = oss.str(); String str = oss.str();
highlight_range(display_buffer, if (it.underlying_iterator() != atom_it->content.begin())
it.underlying_iterator(), (it+1).underlying_iterator(), atom_it = ++line.split(atom_it, it.underlying_iterator());
true, [&str](DisplayAtom& atom){ atom.content.replace(str); if ((it+1).underlying_iterator() != atom_it->content.end())
atom.colors = { Color::Red, Color::Black }; }); atom_it = line.split(atom_it, (it+1).underlying_iterator());
atom_it->content.replace(str);
atom_it->colors = { Color::Red, Color::Black };
break;
} }
} }
} }