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

Revert "Use Modification for region highlighter"

Browse Source 
This reverts commit aa64851de6.

Conflicts:
	src/highlighters.cc
This commit is contained in:
Maxime Coste 2014-05-26 21:01:45 +01:00
parent 19a5ed05a6
commit ce469398c5
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/highlighters.cc
View File

@ -5,7 +5,7 @@
#include "color_registry.hh" #include "color_registry.hh"
#include "context.hh" #include "context.hh"
#include "display_buffer.hh" #include "display_buffer.hh"
#include "modification.hh" #include "line_modification.hh"
#include "option_types.hh" #include "option_types.hh"
#include "register_manager.hh" #include "register_manager.hh"
#include "string.hh" #include "string.hh"
@ -721,7 +721,7 @@ private:
} }
else else
{ {
auto modifs = compute_modifications(buffer, cache.timestamp); auto modifs = compute_line_modifications(buffer, cache.timestamp);
update_matches(buffer, modifs, cache.begin_matches, m_begin); update_matches(buffer, modifs, cache.begin_matches, m_begin);
update_matches(buffer, modifs, cache.end_matches, m_end); update_matches(buffer, modifs, cache.end_matches, m_end);
} }
@ -762,28 +762,26 @@ private:
} }
} }
void update_matches(const Buffer& buffer, memoryview<Modification> modifs, MatchList& matches, const Regex& regex) void update_matches(const Buffer& buffer, memoryview<LineModification> modifs, MatchList& matches, const Regex& regex)
{ {
const size_t buf_timestamp = buffer.timestamp(); const size_t buf_timestamp = buffer.timestamp();
// remove out of date matches and update line for others // remove out of date matches and update line for others
auto ins_pos = matches.begin(); auto ins_pos = matches.begin();
for (auto it = ins_pos; it != matches.end(); ++it) for (auto it = ins_pos; it != matches.end(); ++it)
{ {
const ByteCoord pos{ it->line, it->begin }; auto modif_it = std::lower_bound(modifs.begin(), modifs.end(), it->line,
auto modif_it = std::upper_bound(modifs.begin(), modifs.end(), pos, [](const LineModification& c, const LineCount& l)
[](const ByteCoord& c, const Modification& m) { return c.old_line < l; });
{ return c < m.old_coord; });
bool erase = false; bool erase = false;
if (modif_it != modifs.begin()) if (modif_it != modifs.begin())
{ {
auto& prev = *(modif_it-1); auto& prev = *(modif_it-1);
erase = it->line <= prev.old_coord.line + prev.num_removed.line; erase = it->line <= prev.old_line + prev.num_removed;
it->line += prev.new_coord.line - prev.old_coord.line + it->line += prev.diff();
prev.num_added.line - prev.num_removed.line;
} }
if (modif_it != modifs.end() and modif_it->new_coord.line == it->line) if (modif_it != modifs.end() and modif_it->old_line == it->line)
erase = true; erase = true;
kak_assert(it->line < buffer.line_count()); erase = erase or (it->line >= buffer.line_count());
if (not erase) if (not erase)
{ {
@ -802,24 +800,20 @@ private:
size_t pivot = matches.size(); size_t pivot = matches.size();
// try to find new matches in each updated lines // try to find new matches in each updated lines
LineCount last_line = -1;
for (auto& modif : modifs) for (auto& modif : modifs)
{ {
for (auto line = std::max(last_line + 1, modif.new_coord.line); for (auto line = modif.new_line;
line <= modif.new_coord.line + modif.num_added.line and line < modif.new_line + modif.num_added+1 and
line < buffer.line_count(); line < buffer.line_count(); ++line)
++line)
{ {
auto& l = buffer[line]; auto& l = buffer[line];
using RegexIt = boost::regex_iterator<String::const_iterator>; for (boost::regex_iterator<String::const_iterator> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
for (RegexIt it{l.begin(), l.end(), regex}, end; it != end; ++it)
{ {
ByteCount b = (int)((*it)[0].first - l.begin()); ByteCount b = (int)((*it)[0].first - l.begin());
ByteCount e = (int)((*it)[0].second - l.begin()); ByteCount e = (int)((*it)[0].second - l.begin());
matches.push_back({ buf_timestamp, line, b, e }); matches.push_back({ buf_timestamp, line, b, e });
} }
} }
last_line = modif.new_coord.line + modif.num_added.line;
} }
std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(), std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(),
compare_matches_begin); compare_matches_begin);