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

Bypass RegexIterator in RegionsHighlighter::add_matches

Browse Source
This commit is contained in:
Maxime Coste 2022-08-14 16:28:23 +02:00
parent 021da117cf
commit efa45f8bdd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/highlighters.cc
View File

@ -2233,17 +2233,23 @@ private:
for (auto& [matches, regex, pivot, vm] : matchers) for (auto& [matches, regex, pivot, vm] : matchers)
{ {
for (auto&& m : RegexIterator{l.begin(), l.end(), vm, flags}) auto extra_flags = RegexExecFlags::None;
auto pos = l.begin();
while (vm.exec(pos, l.end(), l.begin(), l.end(), flags | extra_flags))
{ {
const bool with_capture = regex.mark_count() > 0 and m[1].matched and ConstArrayView<const char*> captures = vm.captures();
m[0].second - m[0].first < std::numeric_limits<uint16_t>::max(); const bool with_capture = regex.mark_count() > 0 and captures[2] != nullptr and
captures[1] - captures[0] < std::numeric_limits<uint16_t>::max();
matches.push_back({ matches.push_back({
line, line,
(int)(m[0].first - l.begin()), (int)(captures[0] - l.begin()),
(int)(m[0].second - l.begin()), (int)(captures[1] - l.begin()),
(uint16_t)(with_capture ? m[1].first - m[0].first : 0), (uint16_t)(with_capture ? captures[2] - captures[0] : 0),
(uint16_t)(with_capture ? m[1].second - m[1].first : 0) (uint16_t)(with_capture ? captures[3] - captures[2] : 0)
}); });
pos = captures[1];
extra_flags = (captures[0] == captures[1]) ? RegexExecFlags::NotInitialNull : RegexExecFlags::None;
} }
} }
} }