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

Filters: rewrote colorize_regex

Browse Source
This commit is contained in:
Maxime Coste 2011-10-23 20:26:51 +00:00
parent fffa405bfd
commit 12d933d896
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/filters.cc
View File

@ -6,23 +6,29 @@ namespace Kakoune
void colorize_regex(DisplayBuffer& display_buffer, void colorize_regex(DisplayBuffer& display_buffer,
const boost::regex& ex, Color color) const boost::regex& ex, Color color)
{ {
for (auto atom_it = display_buffer.begin(); BufferIterator display_begin = display_buffer.begin()->begin();
atom_it != display_buffer.end(); ++atom_it) BufferIterator display_end = display_buffer.back().end();
boost::regex_iterator<BufferIterator> re_it(display_begin, display_end,
ex, boost::match_nosubs);
boost::regex_iterator<BufferIterator> re_end;
DisplayBuffer::iterator atom_it = display_buffer.begin();
for (; re_it != re_end; ++re_it)
{ {
boost::match_results<BufferIterator> matches; BufferIterator begin = (*re_it)[0].first;
if (boost::regex_search(atom_it->begin(), atom_it->end(), BufferIterator end = (*re_it)[0].second;
matches, ex, boost::match_nosubs)) auto begin_atom_it = display_buffer.atom_containing(begin, atom_it);
auto end_atom_it = display_buffer.atom_containing(end, atom_it);
if (begin_atom_it == end_atom_it)
{ {
const BufferIterator& begin = matches.begin()->first; if (begin_atom_it->begin() != begin)
if (begin != atom_it->begin()) begin_atom_it = ++display_buffer.split(begin_atom_it, begin);
atom_it = ++display_buffer.split(atom_it, begin); if (begin_atom_it->end() != end)
begin_atom_it = display_buffer.split(begin_atom_it, end);
const BufferIterator& end = matches.begin()->second; begin_atom_it->fg_color() = color;
if (end != atom_it->end())
atom_it = display_buffer.split(atom_it, end);
atom_it->fg_color() = color;
} }
atom_it = begin_atom_it;
} }
} }