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

Ensure that the capture group actually matched in select_matches 

We were creating selections from default constructed iterators,
which happened to have 0,0 coords and led to out-of-order selection
lists.

Fixes #3757
main
Maxime Coste 2020-09-22 21:14:40 +10:00
parent dbd7e4da79
commit 5d17e1132f
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/selectors.cc
View File

@ -929,10 +929,10 @@ Selection find_next_match(const Context& context, const Selection& sel, const Re
template Selection find_next_match<RegexMode::Forward>(const Context&, const Selection&, const Regex&, bool&);
template Selection find_next_match<RegexMode::Backward>(const Context&, const Selection&, const Regex&, bool&);
Vector<Selection> select_matches(const Buffer& buffer, ConstArrayView<Selection> selections, const Regex& regex, int capture)
Vector<Selection> select_matches(const Buffer& buffer, ConstArrayView<Selection> selections, const Regex& regex, int capture_idx)
{
const int mark_count = (int)regex.mark_count();
if (capture < 0 or capture > mark_count)
if (capture_idx < 0 or capture_idx > mark_count)
throw runtime_error("invalid capture number");
Vector<Selection> result;
@ -944,10 +944,9 @@ Vector<Selection> select_matches(const Buffer& buffer, ConstArrayView<Selection>
for (auto&& match : RegexIterator{sel_beg, sel_end, vm, match_flags(buffer, sel_beg, sel_end)})
{
auto begin = match[capture].first;
if (begin == sel_end)
auto capture = match[capture_idx];
if (not capture.matched or capture.first == sel_end)
continue;
auto end = match[capture].second;
CaptureList captures;
captures.reserve(mark_count);
@ -955,6 +954,8 @@ Vector<Selection> select_matches(const Buffer& buffer, ConstArrayView<Selection>
captures.push_back(buffer.string(submatch.first.coord(),
submatch.second.coord()));
auto begin = capture.first, end = capture.second;
kak_assert(result.empty() or begin.coord() >= result.back().min());
result.push_back(
keep_direction({ begin.coord(),
(begin == end ? end : utf8::previous(end, begin)).coord(),
@ -966,9 +967,9 @@ Vector<Selection> select_matches(const Buffer& buffer, ConstArrayView<Selection>
return result;
}
Vector<Selection> split_on_matches(const Buffer& buffer, ConstArrayView<Selection> selections, const Regex& regex, int capture)
Vector<Selection> split_on_matches(const Buffer& buffer, ConstArrayView<Selection> selections, const Regex& regex, int capture_idx)
{
if (capture < 0 or capture > (int)regex.mark_count())
if (capture_idx < 0 or capture_idx > (int)regex.mark_count())
throw runtime_error("invalid capture number");
Vector<Selection> result;
@ -982,7 +983,8 @@ Vector<Selection> split_on_matches(const Buffer& buffer, ConstArrayView<Selectio
for (auto&& match : RegexIterator{begin, sel_end, vm, match_flags(buffer, begin, sel_end)})
{
BufferIterator end = match[capture].first;
auto capture = match[capture_idx];
BufferIterator end = capture.first;
if (end == buf_end)
continue;
@ -991,7 +993,7 @@ Vector<Selection> split_on_matches(const Buffer& buffer, ConstArrayView<Selectio
auto sel_end = (begin == end) ? end : utf8::previous(end, begin);
result.push_back(keep_direction({ begin.coord(), sel_end.coord() }, sel));
}
begin = match[capture].second;
begin = capture.second;
}
if (begin.coord() <= sel.max())
result.push_back(keep_direction({ begin.coord(), sel.max() }, sel));

4
src/selectors.hh
View File

@ -115,11 +115,11 @@ Selection find_next_match(const Context& context, const Selection& sel,
Vector<Selection, MemoryDomain::Selections>
select_matches(const Buffer& buffer, ConstArrayView<Selection> selections,
const Regex& regex, int capture = 0);
const Regex& regex, int capture_idx = 0);
Vector<Selection, MemoryDomain::Selections>
split_on_matches(const Buffer& buffer, ConstArrayView<Selection> selections,
const Regex& regex, int capture = 0);
const Regex& regex, int capture_idx = 0);
Optional<Selection>
select_surrounding(const Context& context, const Selection& selection,

1
test/regression/3757-crash-on-capture-group-select/cmd 100644
View File

@ -0,0 +1 @@
%<a-s>1sfoo(.*)|<ret>

2
test/regression/3757-crash-on-capture-group-select/in 100644
View File

@ -0,0 +1,2 @@
foo
bar

2
test/regression/3757-crash-on-capture-group-select/out 100644
View File

@ -0,0 +1,2 @@
foo
bar