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

StringView based surround selection

Browse Source
This commit is contained in:
Maxime Coste 2016-01-27 08:28:25 +00:00
parent f8106690b1
commit b7530b021a
3 changed files with 122 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/normal.cc
View File

@ -941,23 +941,26 @@ void select_object(Context& context, NormalParams params)
static constexpr struct
{
MatchingPair pair;
StringView opening;
StringView closing;
Codepoint name;
} surrounding_pairs[] = {
{ { '(', ')' }, 'b' },
{ { '{', '}' }, 'B' },
{ { '[', ']' }, 'r' },
{ { '<', '>' }, 'a' },
{ { '"', '"' }, 'Q' },
{ { '\'', '\'' }, 'q' },
{ { '`', '`' }, 'g' },
{ "(", ")", 'b' },
{ "{", "}", 'B' },
{ "[", "]", 'r' },
{ "<", ">", 'a' },
{ "\"", "\"", 'Q' },
{ "'", "'", 'q' },
{ "`", "`", 'g' },
};
for (auto& sur : surrounding_pairs)
{
if (sur.pair.opening == *cp or sur.pair.closing == *cp or
if (sur.opening[0_char] == *cp or
sur.closing[0_char] == *cp or
(sur.name != 0 and sur.name == *cp))
return select<mode>(context, std::bind(select_surrounding, _1, _2,
sur.pair, level, flags));
sur.opening, sur.closing,
level, flags));
}
}, "select object",
"b,(,): parenthesis block\n"

162
src/selectors.cc
View File

@ -74,100 +74,121 @@ Selection select_matching(const Buffer& buffer, const Selection& selection)
return selection;
}
template<typename Iterator, typename Container>
Optional<Iterator> find_closing(Iterator pos, Iterator end,
Container opening, Container closing,
int init_level, bool nestable)
{
const auto opening_len = opening.end() - opening.begin();
const auto closing_len = closing.end() - closing.begin();
int level = nestable ? init_level : 0;
if (end - pos >= opening_len and
std::equal(opening.begin(), opening.end(), pos))
pos += opening_len;
while (pos != end)
{
auto close = std::search(pos, end, closing.begin(), closing.end());
if (close == end)
return {};
if (nestable)
{
for (auto open = pos; open != close; open += opening_len)
{
open = std::search(open, close, opening.begin(), opening.end());
if (open == close)
break;
++level;
}
}
pos = close + closing_len;
if (level == 0)
return pos-1;
--level;
}
return {};
}
template<typename Iterator>
Optional<std::pair<Iterator, Iterator>>
find_surrounding(Iterator begin, Iterator end,
Iterator pos, MatchingPair matching,
Iterator pos, StringView opening, StringView closing,
ObjectFlags flags, int init_level)
{
using Utf8It = utf8::iterator<Iterator>;
const bool to_begin = flags & ObjectFlags::ToBegin;
const bool to_end = flags & ObjectFlags::ToEnd;
const bool nestable = matching.opening != matching.closing;
Utf8It first{pos, begin, end};
const bool nestable = opening != closing;
auto first = pos;
if (to_begin)
{
int level = nestable ? init_level : 0;
while (first != begin)
{
if (nestable and first != pos and *first == matching.closing)
++level;
else if (*first == matching.opening)
{
if (level == 0)
break;
else
--level;
}
--first;
}
if (level != 0 or *first != matching.opening)
using RevIt = std::reverse_iterator<Iterator>;
auto res = find_closing(RevIt{pos+1}, RevIt{begin},
reversed(closing), reversed(opening),
init_level, nestable);
if (not res)
return {};
first = res->base() - 1;
}
Utf8It last{pos, begin, end};
auto last = pos;
if (to_end)
{
int level = nestable ? init_level : 0;
while (last != end)
{
if (nestable and last != pos and *last == matching.opening)
++level;
else if (*last == matching.closing)
{
if (level == 0)
break;
else
--level;
}
++last;
}
if (level != 0 or last == end)
auto res = find_closing(pos, end, opening, closing,
init_level, nestable);
if (not res)
return {};
last = *res;
}
if (flags & ObjectFlags::Inner)
{
if (to_begin and first != last)
++first;
first += (int)opening.length();
if (to_end and first != last)
--last;
last -= (int)closing.length();
}
return to_end ? std::pair<Iterator, Iterator>{first.base(), last.base()}
: std::pair<Iterator, Iterator>{last.base(), first.base()};
return to_end ? std::pair<Iterator, Iterator>{first, last}
: std::pair<Iterator, Iterator>{last, first};
}
template<typename Container, typename Iterator>
Optional<std::pair<Iterator, Iterator>>
find_surrounding(const Container& container, Iterator pos,
MatchingPair matching, ObjectFlags flags, int init_level)
StringView opening, StringView closing,
ObjectFlags flags, int init_level)
{
return find_surrounding(begin(container), end(container), pos,
matching, flags, init_level);
opening, closing, flags, init_level);
}
Selection select_surrounding(const Buffer& buffer, const Selection& selection,
MatchingPair matching, int level,
StringView opening, StringView closing, int level,
ObjectFlags flags)
{
const bool nestable = matching.opening != matching.closing;
const bool nestable = opening != closing;
auto pos = selection.cursor();
if (not nestable or flags & ObjectFlags::Inner)
{
if (auto res = find_surrounding(buffer, buffer.iterator_at(pos),
matching, flags, level))
opening, closing, flags, level))
return utf8_range(res->first, res->second);
return selection;
}
auto c = buffer.byte_at(pos);
if ((flags == ObjectFlags::ToBegin and c == matching.opening) or
(flags == ObjectFlags::ToEnd and c == matching.closing))
if ((flags == ObjectFlags::ToBegin and c == opening) or
(flags == ObjectFlags::ToEnd and c == closing))
++level;
auto res = find_surrounding(buffer, buffer.iterator_at(pos),
matching, flags, level);
opening, closing, flags, level);
if (not res)
return selection;
@ -176,9 +197,8 @@ Selection select_surrounding(const Buffer& buffer, const Selection& selection,
if (flags == (ObjectFlags::ToBegin | ObjectFlags::ToEnd) and
sel.min() == selection.min() and sel.max() == selection.max())
{
if (auto res_parent = find_surrounding(buffer.begin(), buffer.end(),
buffer.iterator_at(pos),
matching, flags, level+1))
if (auto res_parent = find_surrounding(buffer, buffer.iterator_at(pos),
opening, closing, flags, level+1))
return utf8_range(res_parent->first, res_parent->second);
}
return sel;
@ -665,17 +685,49 @@ UnitTest test_find_surrounding{[]()
{
StringView s("[salut { toi[] }]");
{
auto res = find_surrounding(s, s.begin() + 10, { '{', '}' },
auto res = find_surrounding(s, s.begin() + 10, '{', '}',
ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "{ toi[] }");
}
{
auto res = find_surrounding(s, s.begin() + 10, { '[', ']' },
auto res = find_surrounding(s, s.begin() + 10, '[', ']',
ObjectFlags::ToBegin | ObjectFlags::ToEnd | ObjectFlags::Inner, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "salut { toi[] }");
}
{
auto res = find_surrounding(s, s.begin(), '[', ']',
ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "[salut { toi[] }]");
}
{
auto res = find_surrounding(s, s.begin()+7, '{', '}',
ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "{ toi[] }");
}
{
auto res = find_surrounding(s, s.begin() + 12, '[', ']',
ObjectFlags::ToBegin | ObjectFlags::ToEnd | ObjectFlags::Inner, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "]");
}
{
auto res = find_surrounding(s, s.begin() + 14, '[', ']',
ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "[salut { toi[] }]");
}
{
auto res = find_surrounding(s, s.begin() + 1, '[', ']', ObjectFlags::ToBegin, 0);
kak_assert(res and StringView{res->second COMMA res->first+1} == "[s");
}
s = "[]";
{
auto res = find_surrounding(s, s.begin() + 1, '[', ']', ObjectFlags::ToBegin | ObjectFlags::ToEnd, 0);
kak_assert(res and StringView{res->first COMMA res->second+1} == "[]");
}
s = "[*][] hehe";
{
auto res = find_surrounding(s, s.begin() + 6, '[', ']', ObjectFlags::ToBegin, 0);
kak_assert(not res);
}
}};
}

4
src/selectors.hh
View File

@ -304,9 +304,9 @@ Selection find_next_match(const Buffer& buffer, const Selection& sel, const Rege
void select_all_matches(SelectionList& selections, const Regex& regex, unsigned capture = 0);
void split_selections(SelectionList& selections, const Regex& separator_regex, unsigned capture = 0);
struct MatchingPair { Codepoint opening, closing; };
Selection select_surrounding(const Buffer& buffer, const Selection& selection,
MatchingPair matching, int level, ObjectFlags flags);
StringView opening, StringView closing, int level,
ObjectFlags flags);
}