1
1
mirror of https://github.com/mawww/kakoune.git synced 2024-12-25 12:36:11 +03:00

add paragraph (p) object

This commit is contained in:
Maxime Coste 2013-04-30 14:29:18 +02:00
parent 4bb3863f95
commit b69c9ea753
4 changed files with 37 additions and 0 deletions

View File

@ -210,6 +210,7 @@ object you want.
* _w_: select the whole word
* _W_: select the whole WORD
* _s_: select the sentence
* _p_: select the paragraph
Registers
---------

View File

@ -524,6 +524,7 @@ void select_object(Context& context)
{ { 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) },
};
auto it = key_to_selector.find(key);

View File

@ -421,6 +421,40 @@ Selection select_whole_sentence(const Selection& selection, bool inner)
return Selection{first, last};
}
Selection select_whole_paragraph(const Selection& selection, bool inner)
{
BufferIterator first = selection.last();
while (not is_begin(first))
{
char cur = *first;
char prev = *(first-1);
if (is_eol(prev) and is_eol(cur))
{
++first;
break;
}
--first;
}
BufferIterator last = first;
while (not is_end(last))
{
char cur = *last;
char prev = *(last-1);
if (is_eol(cur) and is_eol(prev))
{
if (not inner)
skip_while(last, is_eol);
--last;
break;
}
++last;
}
return Selection{first, last};
}
Selection select_whole_lines(const Selection& selection)
{
// no need to be utf8 aware for is_eol as we only use \n as line seperator

View File

@ -28,6 +28,7 @@ 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_sentence(const Selection& selection, bool inner);
Selection select_whole_paragraph(const Selection& selection, bool inner);
Selection select_whole_lines(const Selection& selection);
Selection select_whole_buffer(const Selection& selection);
Selection trim_partial_lines(const Selection& selection);