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

Add " and ' support to object selection

Browse Source
This commit is contained in:
Maxime Coste 2013-02-27 19:08:13 +01:00
parent be0c5ddf49
commit 9230667c11
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cc
View File

@ -360,6 +360,8 @@ void do_select_object(Context& context)
{ { Key::Modifiers::None, ']' }, std::bind(select_surrounding, _1, CodepointPair{ '[', ']' }, flags) }, { { Key::Modifiers::None, ']' }, std::bind(select_surrounding, _1, CodepointPair{ '[', ']' }, flags) },
{ { Key::Modifiers::None, '<' }, std::bind(select_surrounding, _1, CodepointPair{ '<', '>' }, flags) }, { { Key::Modifiers::None, '<' }, std::bind(select_surrounding, _1, CodepointPair{ '<', '>' }, flags) },
{ { Key::Modifiers::None, '>' }, std::bind(select_surrounding, _1, CodepointPair{ '<', '>' }, flags) }, { { Key::Modifiers::None, '>' }, std::bind(select_surrounding, _1, CodepointPair{ '<', '>' }, flags) },
{ { Key::Modifiers::None, '"' }, std::bind(select_surrounding, _1, CodepointPair{ '"', '"' }, flags) },
{ { Key::Modifiers::None, '\'' }, std::bind(select_surrounding, _1, CodepointPair{ '\'', '\'' }, flags) },
{ { Key::Modifiers::None, 'w' }, std::bind(select_whole_word<false>, _1, flags & SurroundFlags::Inner) }, { { Key::Modifiers::None, 'w' }, std::bind(select_whole_word<false>, _1, flags & SurroundFlags::Inner) },
{ { Key::Modifiers::None, 'W' }, std::bind(select_whole_word<true>, _1, flags & SurroundFlags::Inner) }, { { Key::Modifiers::None, 'W' }, std::bind(select_whole_word<true>, _1, flags & SurroundFlags::Inner) },
}; };

5
src/selectors.cc
View File

@ -228,13 +228,14 @@ Selection select_surrounding(const Selection& selection,
{ {
const bool to_begin = flags & SurroundFlags::ToBegin; const bool to_begin = flags & SurroundFlags::ToBegin;
const bool to_end = flags & SurroundFlags::ToEnd; const bool to_end = flags & SurroundFlags::ToEnd;
const bool nestable = matching.first != matching.second;
Utf8Iterator first = selection.last(); Utf8Iterator first = selection.last();
if (to_begin) if (to_begin)
{ {
int level = 0; int level = 0;
while (not is_begin(first)) while (not is_begin(first))
{ {
if (first != selection.last() and *first == matching.second) if (nestable and first != selection.last() and *first == matching.second)
++level; ++level;
else if (*first == matching.first) else if (*first == matching.first)
{ {
@ -256,7 +257,7 @@ Selection select_surrounding(const Selection& selection,
last = first + 1; last = first + 1;
while (not is_end(last)) while (not is_end(last))
{ {
if (*last == matching.first) if (nestable and *last == matching.first)
++level; ++level;
else if (*last == matching.second) else if (*last == matching.second)
{ {