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

Fix in region highlighter

Browse Source
This commit is contained in:
Maxime Coste 2014-06-02 15:42:03 +01:00
parent c8354588c9
commit 8d9ed5e8c7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/highlighters.cc
View File

@ -772,15 +772,14 @@ private:
auto modif_it = std::lower_bound(modifs.begin(), modifs.end(), it->line, auto modif_it = std::lower_bound(modifs.begin(), modifs.end(), it->line,
[](const LineModification& c, const LineCount& l) [](const LineModification& c, const LineCount& l)
{ return c.old_line < l; }); { return c.old_line < l; });
bool erase = false;
if (modif_it != modifs.begin()) bool erase = (modif_it != modifs.end() and modif_it->old_line == it->line);
if (not erase and modif_it != modifs.begin())
{ {
auto& prev = *(modif_it-1); auto& prev = *(modif_it-1);
erase = it->line <= prev.old_line + prev.num_removed; erase = it->line <= prev.old_line + prev.num_removed;
it->line += prev.diff(); it->line += prev.diff();
} }
if (modif_it != modifs.end() and modif_it->old_line == it->line)
erase = true;
erase = erase or (it->line >= buffer.line_count()); erase = erase or (it->line >= buffer.line_count());
if (not erase) if (not erase)