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

Full object selection support for paragraphs and sentences

Browse Source
This commit is contained in:
Maxime Coste 2013-05-15 14:24:09 +02:00
parent ef7d90cbfa
commit 64b20729a5
3 changed files with 146 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/normal.cc
View File

@ -501,7 +501,7 @@ void deindent(Context& context)
editor.erase();
}
template<SurroundFlags flags>
template<ObjectFlags flags>
void select_object(Context& context)
{
context.input_handler().on_next_key(
@ -522,10 +522,10 @@ void 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, '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, 's' }, std::bind(select_whole_sentence, _1, flags & SurroundFlags::Inner) },
{ { Key::Modifiers::None, 'p' }, std::bind(select_whole_paragraph, _1, flags & SurroundFlags::Inner) },
{ { Key::Modifiers::None, 'w' }, std::bind(select_whole_word<false>, _1, flags) },
{ { Key::Modifiers::None, 'W' }, std::bind(select_whole_word<true>, _1, flags) },
{ { Key::Modifiers::None, 's' }, std::bind(select_whole_sentence, _1, flags) },
{ { Key::Modifiers::None, 'p' }, std::bind(select_whole_paragraph, _1, flags) },
};
auto it = key_to_selector.find(key);
@ -783,10 +783,10 @@ KeyMap keymap =
{ { Key::Modifiers::None, 'u' }, repeated([](Context& context) { if (not context.editor().undo()) { context.print_status({ "nothing left to undo", get_color("Information") }); } }) },
{ { Key::Modifiers::None, 'U' }, repeated([](Context& context) { if (not context.editor().redo()) { context.print_status({ "nothing left to redo", get_color("Information") }); } }) },
{ { Key::Modifiers::Alt, 'i' }, select_object<SurroundFlags::ToBegin | SurroundFlags::ToEnd | SurroundFlags::Inner> },
{ { Key::Modifiers::Alt, 'a' }, select_object<SurroundFlags::ToBegin | SurroundFlags::ToEnd> },
{ { Key::Modifiers::None, ']' }, select_object<SurroundFlags::ToEnd> },
{ { Key::Modifiers::None, '[' }, select_object<SurroundFlags::ToBegin> },
{ { Key::Modifiers::Alt, 'i' }, select_object<ObjectFlags::ToBegin | ObjectFlags::ToEnd | ObjectFlags::Inner> },
{ { Key::Modifiers::Alt, 'a' }, select_object<ObjectFlags::ToBegin | ObjectFlags::ToEnd> },
{ { Key::Modifiers::None, ']' }, select_object<ObjectFlags::ToEnd> },
{ { Key::Modifiers::None, '[' }, select_object<ObjectFlags::ToBegin> },
{ { Key::Modifiers::Alt, 'j' }, join },
{ { Key::Modifiers::Alt, 'J' }, join_select_spaces },

101
src/selectors.cc
View File

@ -227,10 +227,10 @@ Selection select_matching(const Selection& selection)
using boost::optional;
static optional<Range> find_surrounding(const BufferIterator& pos,
const CodepointPair& matching,
SurroundFlags flags)
ObjectFlags flags)
{
const bool to_begin = flags & SurroundFlags::ToBegin;
const bool to_end = flags & SurroundFlags::ToEnd;
const bool to_begin = flags & ObjectFlags::ToBegin;
const bool to_end = flags & ObjectFlags::ToEnd;
const bool nestable = matching.first != matching.second;
Utf8Iterator first = pos;
if (to_begin)
@ -275,7 +275,7 @@ static optional<Range> find_surrounding(const BufferIterator& pos,
return optional<Range>{};
}
if (flags & SurroundFlags::Inner)
if (flags & ObjectFlags::Inner)
{
if (to_begin)
++first;
@ -287,13 +287,13 @@ static optional<Range> find_surrounding(const BufferIterator& pos,
Selection select_surrounding(const Selection& selection,
const CodepointPair& matching,
SurroundFlags flags)
ObjectFlags flags)
{
auto res = find_surrounding(selection.last(), matching, flags);
if (not res)
return selection;
if (flags == (SurroundFlags::ToBegin | SurroundFlags::ToEnd) and
if (flags == (ObjectFlags::ToBegin | ObjectFlags::ToEnd) and
matching.first != matching.second and not res->last().is_end() and
(*res == selection or Range{res->last(), res->first()} == selection))
{
@ -354,55 +354,81 @@ Selection select_to_eol_reverse(const Selection& selection)
}
template<bool punctuation_is_word>
Selection select_whole_word(const Selection& selection, bool inner)
Selection select_whole_word(const Selection& selection, ObjectFlags flags)
{
Utf8Iterator first = selection.last();
Utf8Iterator last = first;
if (is_word(*first))
if (is_word<punctuation_is_word>(*first))
{
if (flags & ObjectFlags::ToBegin)
{
skip_while_reverse(first, is_word<punctuation_is_word>);
if (not is_word<punctuation_is_word>(*first))
++first;
skip_while(last, is_word<punctuation_is_word>);
if (not inner)
skip_while(last, is_blank);
}
else if (not inner)
if (flags & ObjectFlags::ToEnd)
{
skip_while(last, is_word<punctuation_is_word>);
if (not (flags & ObjectFlags::Inner))
skip_while(last, is_blank);
--last;
}
}
else if (not (flags & ObjectFlags::Inner))
{
if (flags & ObjectFlags::ToBegin)
{
skip_while_reverse(first, is_blank);
if (is_blank(*first))
++first;
skip_while(last, is_blank);
if (not is_word<punctuation_is_word>(*last))
if (not is_word<punctuation_is_word>(*first))
return selection;
skip_while(last, is_word<punctuation_is_word>);
skip_while_reverse(first, is_word<punctuation_is_word>);
if (not is_word<punctuation_is_word>(*first))
++first;
}
if (flags & ObjectFlags::ToEnd)
{
skip_while(last, is_blank);
--last;
return utf8_range(first, last);
}
}
return (flags & ObjectFlags::ToEnd) ? utf8_range(first, last)
: utf8_range(last, first);
}
template Selection select_whole_word<false>(const Selection&, bool);
template Selection select_whole_word<true>(const Selection&, bool);
template Selection select_whole_word<false>(const Selection&, ObjectFlags);
template Selection select_whole_word<true>(const Selection&, ObjectFlags);
Selection select_whole_sentence(const Selection& selection, bool inner)
Selection select_whole_sentence(const Selection& selection, ObjectFlags flags)
{
BufferIterator first = selection.last();
BufferIterator last = first;
if (flags & ObjectFlags::ToBegin)
{
bool saw_non_blank = false;
while (not is_begin(first))
{
char cur = *first;
char prev = *(first-1);
if (not is_blank(cur))
saw_non_blank = true;
if (is_eol(prev) and is_eol(cur))
{
++first;
break;
}
else if (prev == '.' or prev == ';')
else if (prev == '.' or prev == ';' or prev == '!' or prev == '?')
{
if (saw_non_blank)
break;
else if (flags & ObjectFlags::ToEnd)
last = first-1;
}
--first;
}
skip_while(first, is_blank);
BufferIterator last = first;
}
if (flags & ObjectFlags::ToEnd)
{
while (not is_end(last))
{
char cur = *last;
@ -411,20 +437,27 @@ Selection select_whole_sentence(const Selection& selection, bool inner)
break;
++last;
}
if (not inner and not is_end(last))
if (not (flags & ObjectFlags::Inner) and not is_end(last))
{
++last;
skip_while(last, is_blank);
--last;
}
return Selection{first, last};
}
return (flags & ObjectFlags::ToEnd) ? Selection{first, last}
: Selection{last, first};
}
Selection select_whole_paragraph(const Selection& selection, bool inner)
Selection select_whole_paragraph(const Selection& selection, ObjectFlags flags)
{
BufferIterator first = selection.last();
BufferIterator last = first;
if (flags & ObjectFlags::ToBegin and not is_begin(first))
{
skip_while_reverse(first, is_eol);
if (flags & ObjectFlags::ToEnd)
last = first;
while (not is_begin(first))
{
char cur = *first;
@ -436,23 +469,25 @@ Selection select_whole_paragraph(const Selection& selection, bool inner)
}
--first;
}
BufferIterator last = first;
}
if (flags & ObjectFlags::ToEnd)
{
while (not is_end(last))
{
char cur = *last;
char prev = *(last-1);
if (is_eol(cur) and is_eol(prev))
{
if (not inner)
if (not (flags & ObjectFlags::Inner))
skip_while(last, is_eol);
--last;
break;
}
++last;
}
return Selection{first, last};
}
return (flags & ObjectFlags::ToEnd) ? Selection{first, last}
: Selection{last, first};
}
Selection select_whole_lines(const Selection& selection)

30
src/selectors.hh
View File

@ -25,10 +25,21 @@ Selection select_to_reverse(const Selection& selection,
Selection select_to_eol(const Selection& selection);
Selection select_to_eol_reverse(const Selection& selection);
enum class ObjectFlags
{
ToBegin = 1,
ToEnd = 2,
Inner = 4
};
constexpr bool operator&(ObjectFlags lhs, ObjectFlags rhs)
{ return (bool)((int)lhs & (int) rhs); }
constexpr ObjectFlags operator|(ObjectFlags lhs, ObjectFlags rhs)
{ return (ObjectFlags)((int)lhs | (int) rhs); }
template<bool punctuation_is_word>
Selection select_whole_word(const Selection& selection, bool inner);
Selection select_whole_sentence(const Selection& selection, bool inner);
Selection select_whole_paragraph(const Selection& selection, bool inner);
Selection select_whole_word(const Selection& selection, ObjectFlags flags);
Selection select_whole_sentence(const Selection& selection, ObjectFlags flags);
Selection select_whole_paragraph(const Selection& selection, ObjectFlags flags);
Selection select_whole_lines(const Selection& selection);
Selection select_whole_buffer(const Selection& selection);
Selection trim_partial_lines(const Selection& selection);
@ -42,21 +53,10 @@ SelectionList select_all_matches(const Selection& selection,
SelectionList split_selection(const Selection& selection,
const Regex& separator_regex);
enum class SurroundFlags
{
ToBegin = 1,
ToEnd = 2,
Inner = 4
};
constexpr bool operator&(SurroundFlags lhs, SurroundFlags rhs)
{ return (bool)((int)lhs & (int) rhs); }
constexpr SurroundFlags operator|(SurroundFlags lhs, SurroundFlags rhs)
{ return (SurroundFlags)((int)lhs | (int) rhs); }
using CodepointPair = std::pair<Codepoint, Codepoint>;
Selection select_surrounding(const Selection& selection,
const CodepointPair& matching,
SurroundFlags flags);
ObjectFlags flags);
}