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

Optimize TabulationHighlighter

Browse Source
This commit is contained in:
Maxime Coste 2022-12-15 13:16:07 +11:00
parent 36d1713b09
commit 8279a3776f
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/highlighters.cc
View File

@ -976,27 +976,46 @@ struct TabulationHighlighter : Highlighter
const auto& buffer = context.context.buffer(); const auto& buffer = context.context.buffer();
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
{ {
ColumnCount column = 0;
const char* line_data = nullptr;
const char* pos = nullptr;
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it) for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
{ {
if (atom_it->type() != DisplayAtom::Range) if (atom_it->type() != DisplayAtom::Range)
continue; continue;
auto begin = get_iterator(buffer, atom_it->begin()); auto begin = atom_it->begin();
auto end = get_iterator(buffer, atom_it->end()); if (auto* atom_line_data = buffer[begin.line].data(); atom_line_data != line_data)
for (BufferIterator it = begin; it != end; ++it)
{ {
if (*it == '\t') pos = line_data = atom_line_data;
{ column = 0;
if (it != begin) }
atom_it = ++line.split(atom_it, it.coord());
if (it+1 != end)
atom_it = line.split(atom_it, (it+1).coord());
const ColumnCount column = get_column(buffer, tabstop, it.coord()); kak_assert(pos != nullptr and pos <= line_data + (int)begin.column);
const ColumnCount count = tabstop - (column % tabstop); for (auto end = line_data + (int)atom_it->end().column; pos != end; ++pos)
atom_it->replace(String{' ', count}); {
const char* next_tab = std::find(pos, end, '\t');
if (next_tab == end)
{
pos = end;
break; break;
} }
while (pos != next_tab)
column += codepoint_width(utf8::read_codepoint(pos, next_tab));
const ColumnCount tabwidth = tabstop - (column % tabstop);
column += tabwidth;
if (pos >= line_data + (int)atom_it->begin().column)
{
if (pos != line_data + (int)atom_it->begin().column)
atom_it = ++line.split(atom_it, {begin.line, ByteCount(pos - line_data)});
if (pos + 1 != end)
atom_it = line.split(atom_it, {begin.line, ByteCount(pos + 1 - line_data)});
atom_it->replace(String{' ', tabwidth});
++atom_it;
}
} }
} }
} }