From 148d6c205bf4a874dde2230b98281f02ae8bd579 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 7 May 2018 22:16:13 +1000 Subject: [PATCH] Fix wrong behaviour in select surrounding Fixes #2030 --- src/selectors.cc | 11 +++++++++-- test/regression/2030-custom-selection-nesting/cmd | 1 + test/regression/2030-custom-selection-nesting/in | 1 + .../2030-custom-selection-nesting/selections | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 test/regression/2030-custom-selection-nesting/cmd create mode 100644 test/regression/2030-custom-selection-nesting/in create mode 100644 test/regression/2030-custom-selection-nesting/selections diff --git a/src/selectors.cc b/src/selectors.cc index f7f1a367..4aecbef1 100644 --- a/src/selectors.cc +++ b/src/selectors.cc @@ -344,6 +344,7 @@ find_surrounding(const Container& container, Iterator pos, pos = matches[0].second; auto first = pos; + auto last = pos; if (flags & ObjectFlags::ToBegin) { // When positionned onto opening and searching to opening, search the parent one @@ -353,12 +354,17 @@ find_surrounding(const Container& container, Iterator pos, first = utf8::previous(first, container.begin()); if (auto res = find_opening(first+1, container, opening, closing, level, nestable)) + { first = (flags & ObjectFlags::Inner) ? res->second : res->first; + if (flags & ObjectFlags::ToEnd) // ensure we find the matching end + { + last = res->second; + level = 0; + } + } else return {}; } - - auto last = pos; if (flags & ObjectFlags::ToEnd) { // When positionned onto closing and searching to closing, search the parent one @@ -1030,6 +1036,7 @@ UnitTest test_find_surrounding{[]() s = "begin foo begin bar end end"; check_equal(s.begin() + 6, "begin", "end", ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0, s); + check_equal(s.begin() + 22, "begin", "end", ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0, "begin bar end"); }}; } diff --git a/test/regression/2030-custom-selection-nesting/cmd b/test/regression/2030-custom-selection-nesting/cmd new file mode 100644 index 00000000..d29fb683 --- /dev/null +++ b/test/regression/2030-custom-selection-nesting/cmd @@ -0,0 +1 @@ +caa,cccaa,cc diff --git a/test/regression/2030-custom-selection-nesting/in b/test/regression/2030-custom-selection-nesting/in new file mode 100644 index 00000000..18596294 --- /dev/null +++ b/test/regression/2030-custom-selection-nesting/in @@ -0,0 +1 @@ +aa aa %(bb) cc cc diff --git a/test/regression/2030-custom-selection-nesting/selections b/test/regression/2030-custom-selection-nesting/selections new file mode 100644 index 00000000..176daf9a --- /dev/null +++ b/test/regression/2030-custom-selection-nesting/selections @@ -0,0 +1 @@ +aa aa bb cc cc