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

Display non breaking spaces with ⍽ in show_whitespaces hihglighter

Browse Source 
Fixes #167
This commit is contained in:
Maxime Coste 2016-12-02 13:59:34 +00:00
parent d88d0bac42
commit 5ff8245cc8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/highlighters.cc
View File

@ -695,26 +695,29 @@ void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffe
auto begin = buffer.iterator_at(atom_it->begin()); auto begin = buffer.iterator_at(atom_it->begin());
auto end = buffer.iterator_at(atom_it->end()); auto end = buffer.iterator_at(atom_it->end());
for (BufferIterator it = begin; it != end; ++it) for (BufferIterator it = begin; it != end; )
{ {
auto c = *it; auto coord = it.coord();
if (c == '\t' or c == ' ' or c == '\n') Codepoint cp = utf8::read_codepoint<utf8::InvalidPolicy::Pass>(it, end);
if (cp == '\t' or cp == ' ' or cp == '\n' or cp == 0xA0)
{ {
if (it != begin) if (coord != begin.coord())
atom_it = ++line.split(atom_it, it.coord()); atom_it = ++line.split(atom_it, coord);
if (it+1 != end) if (it != end)
atom_it = line.split(atom_it, (it+1).coord()); atom_it = line.split(atom_it, it.coord());
if (c == '\t') if (cp == '\t')
{ {
int column = (int)get_column(buffer, tabstop, it.coord()); int column = (int)get_column(buffer, tabstop, it.coord());
int count = tabstop - (column % tabstop); int count = tabstop - (column % tabstop);
atom_it->replace("→" + String(' ', CharCount{count-1})); atom_it->replace("→" + String(' ', CharCount{count-1}));
} }
else if (c == ' ') else if (cp == ' ')
atom_it->replace("·"); atom_it->replace("·");
else if (c == '\n') else if (cp == '\n')
atom_it->replace("¬"); atom_it->replace("¬");
else if (cp == 0xA0)
atom_it->replace("⍽");
atom_it->face = whitespaceface; atom_it->face = whitespaceface;
break; break;
} }