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

RegionHighlighter: correct coordinates that are one past end of line

Browse Source 
As region highlighters store per lines matches, end of line ones
are not valid buffer coordinates and must be corrected as begining
of next line.
This commit is contained in:
Maxime Coste 2014-01-18 10:52:26 +00:00
parent 5cffc48efc
commit 2ac545d306
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/highlighters.cc
View File

@ -536,13 +536,20 @@ public:
if (flags != HighlightFlags::Highlight) if (flags != HighlightFlags::Highlight)
return; return;
auto range = display_buffer.range(); auto range = display_buffer.range();
auto& regions = update_cache_ifn(context.buffer()); const auto& buffer = context.buffer();
auto& regions = update_cache_ifn(buffer);
auto begin = std::lower_bound(regions.begin(), regions.end(), range.first, auto begin = std::lower_bound(regions.begin(), regions.end(), range.first,
[](const Region& r, const BufferCoord& c) { return r.end < c; }); [](const Region& r, const BufferCoord& c) { return r.end < c; });
auto end = std::lower_bound(begin, regions.end(), range.second, auto end = std::lower_bound(begin, regions.end(), range.second,
[](const Region& r, const BufferCoord& c) { return r.begin < c; }); [](const Region& r, const BufferCoord& c) { return r.begin < c; });
auto correct = [&](const BufferCoord& c) {
if (buffer[c.line].length() == c.column)
return BufferCoord{c.line+1, 0};
return c;
};
for (; begin != end; ++begin) for (; begin != end; ++begin)
m_func(context, flags, display_buffer, begin->begin, begin->end); m_func(context, flags, display_buffer,
correct(begin->begin), correct(begin->end));
} }
private: private:
Regex m_begin; Regex m_begin;
@ -732,8 +739,10 @@ private:
if (not erase) if (not erase)
{ {
it->timestamp = buf_timestamp; it->timestamp = buf_timestamp;
kak_assert(buffer.is_valid({it->line, it->begin})); kak_assert(buffer.is_valid({it->line, it->begin}) or
kak_assert(buffer.is_valid({it->line, it->end})); buffer[it->line].length() == it->begin);
kak_assert(buffer.is_valid({it->line, it->end}) or
buffer[it->line].length() == it->end);
if (ins_pos != it) if (ins_pos != it)
*ins_pos = std::move(*it); *ins_pos = std::move(*it);