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

Cleanup RegexHighlighter code and drop cache when it becomes too big

Browse Source 
The RegexHighlighter range cache can get pretty big in nested
regions use cases, and maintaining it can become pretty costly,
so if it hits a certain size, just drop it.

Should improve performances in #2454
This commit is contained in:
Maxime Coste 2018-10-10 21:56:03 +11:00
parent 194a5db5d6
commit 71e27c73af
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/highlighters.cc
View File

@ -280,7 +280,7 @@ public:
return spec.second.empty() ? Face{} : faces[spec.second]; return spec.second.empty() ? Face{} : faces[spec.second];
}) | gather<Vector<Face>>(); }) | gather<Vector<Face>>();
auto& matches = get_matches(context.context.buffer(), display_buffer.range(), range); const auto& matches = get_matches(context.context.buffer(), display_buffer.range(), range);
kak_assert(matches.size() % m_faces.size() == 0); kak_assert(matches.size() % m_faces.size() == 0);
for (size_t m = 0; m < matches.size(); ++m) for (size_t m = 0; m < matches.size(); ++m)
{ {
@ -352,8 +352,7 @@ private:
m_faces.emplace(m_faces.begin(), 0, String{}); m_faces.emplace(m_faces.begin(), 0, String{});
} }
void add_matches(const Buffer& buffer, MatchList& matches, void add_matches(const Buffer& buffer, MatchList& matches, BufferRange range)
BufferRange range)
{ {
kak_assert(matches.size() % m_faces.size() == 0); kak_assert(matches.size() % m_faces.size() == 0);
using RegexIt = RegexIterator<BufferIterator>; using RegexIt = RegexIterator<BufferIterator>;
@ -375,26 +374,27 @@ private:
} }
} }
MatchList& get_matches(const Buffer& buffer, BufferRange display_range, const MatchList& get_matches(const Buffer& buffer, BufferRange display_range, BufferRange buffer_range)
BufferRange buffer_range)
{ {
Cache& cache = m_cache.get(buffer); Cache& cache = m_cache.get(buffer);
auto& matches = cache.m_matches; auto& matches = cache.m_matches;
if (cache.m_regex_version != m_regex_version or if (cache.m_regex_version != m_regex_version or
cache.m_timestamp != buffer.timestamp()) cache.m_timestamp != buffer.timestamp() or
matches.size() > 1000)
{ {
matches.clear(); matches.clear();
cache.m_timestamp = buffer.timestamp(); cache.m_timestamp = buffer.timestamp();
cache.m_regex_version = m_regex_version; cache.m_regex_version = m_regex_version;
} }
const LineCount line_offset = 3; const LineCount line_offset = 3;
BufferRange range{std::max<BufferCoord>(buffer_range.begin, display_range.begin.line - line_offset), BufferRange range{std::max<BufferCoord>(buffer_range.begin, display_range.begin.line - line_offset),
std::min<BufferCoord>(buffer_range.end, display_range.end.line + line_offset)}; std::min<BufferCoord>(buffer_range.end, display_range.end.line + line_offset)};
auto it = std::upper_bound(matches.begin(), matches.end(), range, auto it = std::upper_bound(matches.begin(), matches.end(), range.begin,
[](const BufferRange& lhs, const Cache::RangeAndMatches& rhs) [](const BufferCoord& lhs, const Cache::RangeAndMatches& rhs)
{ return lhs.begin < rhs.range.end; }); { return lhs < rhs.range.end; });
if (it == matches.end() or it->range.begin > range.end) if (it == matches.end() or it->range.begin > range.end)
{ {
@ -423,14 +423,12 @@ private:
// add regex matches from new begin to old first match end // add regex matches from new begin to old first match end
if (range.begin < old_range.begin) if (range.begin < old_range.begin)
{ {
old_range.begin = range.begin;
MatchList new_matches;
add_matches(buffer, new_matches, {range.begin, first_end});
matches.erase(matches.begin(), matches.begin() + m_faces.size()); matches.erase(matches.begin(), matches.begin() + m_faces.size());
size_t pivot = matches.size();
old_range.begin = range.begin;
add_matches(buffer, matches, {range.begin, first_end});
std::copy(std::make_move_iterator(new_matches.begin()), std::rotate(matches.begin(), matches.begin() + pivot, matches.end());
std::make_move_iterator(new_matches.end()),
std::inserter(matches, matches.begin()));
} }
// add regex matches from old last match begin to new end // add regex matches from old last match begin to new end
if (old_range.end < range.end) if (old_range.end < range.end)