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

Use a cache for region highlighter

Browse Source
This commit is contained in:
Maxime Coste 2013-12-04 18:52:16 +00:00
parent 054ae08a9f
commit 35f12bc5a0
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/highlighters.cc
View File

@ -73,9 +73,8 @@ public:
void operator()(const Window& window, DisplayBuffer& display_buffer) void operator()(const Window& window, DisplayBuffer& display_buffer)
{ {
const Buffer& buffer = window.buffer(); auto& cache = update_cache_ifn(window.buffer(), display_buffer.range());
update_cache_ifn(buffer, display_buffer.range()); for (auto& match : cache.m_matches)
for (auto& match : m_caches[&buffer].m_matches)
{ {
for (size_t n = 0; n < match.size(); ++n) for (size_t n = 0; n < match.size(); ++n)
{ {
@ -101,14 +100,14 @@ private:
Regex m_regex; Regex m_regex;
ColorSpec m_colors; ColorSpec m_colors;
void update_cache_ifn(const Buffer& buffer, const BufferRange& range) MatchesCache& update_cache_ifn(const Buffer& buffer, const BufferRange& range)
{ {
MatchesCache& cache = m_caches[&buffer]; MatchesCache& cache = m_caches[&buffer];
if (buffer.timestamp() == cache.m_timestamp and if (buffer.timestamp() == cache.m_timestamp and
range.first >= cache.m_range.first and range.first >= cache.m_range.first and
range.second <= cache.m_range.second) range.second <= cache.m_range.second)
return; return cache;
cache.m_range.first = buffer.clamp({range.first.line - 10, 0}); cache.m_range.first = buffer.clamp({range.first.line - 10, 0});
cache.m_range.second = buffer.next(buffer.clamp({range.second.line + 10, INT_MAX})); cache.m_range.second = buffer.next(buffer.clamp({range.second.line + 10, INT_MAX}));
@ -125,6 +124,7 @@ private:
for (auto& sub : *re_it) for (auto& sub : *re_it)
match.emplace_back(sub.first.coord(), sub.second.coord()); match.emplace_back(sub.first.coord(), sub.second.coord());
} }
return cache;
} }
}; };
@ -431,7 +431,31 @@ public:
void operator()(const Window& window, DisplayBuffer& display_buffer) void operator()(const Window& window, DisplayBuffer& display_buffer)
{ {
auto& buffer = window.buffer(); auto& cache = update_cache_ifn(window.buffer());
for (auto& pair : cache.regions)
highlight_range(display_buffer, pair.first, pair.second, true,
[this](DisplayAtom& atom) { atom.colors = m_colors; });
}
private:
String m_begin;
String m_end;
String m_ignore_prefix;
ColorPair m_colors;
struct RegionCache
{
size_t timestamp = -1;
std::vector<std::pair<BufferCoord, BufferCoord>> regions;
};
std::unordered_map<const Buffer*, RegionCache> m_cache;
RegionCache& update_cache_ifn(const Buffer& buffer)
{
RegionCache& cache = m_cache[&buffer];
if (cache.timestamp == buffer.timestamp())
return cache;
cache.regions.clear();
auto end = buffer.end(); auto end = buffer.end();
auto reg_beg = std::search(buffer.begin(), end, auto reg_beg = std::search(buffer.begin(), end,
m_begin.begin(), m_begin.end()); m_begin.begin(), m_begin.end());
@ -448,18 +472,14 @@ public:
std::equal(m_ignore_prefix.begin(), m_ignore_prefix.end(), std::equal(m_ignore_prefix.begin(), m_ignore_prefix.end(),
reg_end - m_end.length() - m_ignore_prefix.length())); reg_end - m_end.length() - m_ignore_prefix.length()));
highlight_range(display_buffer, reg_beg.coord(), reg_end.coord(), true, cache.regions.emplace_back(reg_beg.coord(), reg_end.coord());
[this](DisplayAtom& atom) { atom.colors = m_colors; });
if (reg_end == end) if (reg_end == end)
break; break;
reg_beg = std::search(reg_end, end, m_begin.begin(), m_begin.end()); reg_beg = std::search(reg_end, end, m_begin.begin(), m_begin.end());
} }
cache.timestamp = buffer.timestamp();
return cache;
} }
private:
String m_begin;
String m_end;
String m_ignore_prefix;
ColorPair m_colors;
}; };
HighlighterAndId region_factory(HighlighterParameters params) HighlighterAndId region_factory(HighlighterParameters params)