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

Selectors: more vi-like words movements

Browse Source
This commit is contained in:
Maxime Coste 2011-09-22 14:00:31 +00:00
parent 5a46ad49ea
commit a8cac32fe0
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/selectors.cc
View File

@ -23,17 +23,41 @@ static bool is_word(char c)
return true; return true;
if (c >= 'A' and c <= 'Z') if (c >= 'A' and c <= 'Z')
return true; return true;
if (c == '_')
return true;
return false; return false;
} }
static bool is_punctuation(char c)
{
return not (is_word(c) or is_blank(c));
}
template<typename T>
void skip_while(BufferIterator& it, T condition)
{
while (not it.is_end() and condition(*it))
++it;
}
template<typename T>
void skip_while_reverse(BufferIterator& it, T condition)
{
while (not it.is_begin() and condition(*it))
--it;
}
Selection select_to_next_word(const BufferIterator& cursor) Selection select_to_next_word(const BufferIterator& cursor)
{ {
BufferIterator end = cursor; BufferIterator end = cursor;
while (not end.is_end() and is_word(*end))
++end;
while (not end.is_end() and not is_word(*end)) if (is_word(*end))
++end; skip_while(end, is_word);
else if (is_punctuation(*end))
skip_while(end, is_punctuation);
skip_while(end, is_blank);
return Selection(cursor, end); return Selection(cursor, end);
} }
@ -41,11 +65,13 @@ Selection select_to_next_word(const BufferIterator& cursor)
Selection select_to_next_word_end(const BufferIterator& cursor) Selection select_to_next_word_end(const BufferIterator& cursor)
{ {
BufferIterator end = cursor; BufferIterator end = cursor;
while (not end.is_end() and not is_word(*end))
++end;
while (not end.is_end() and is_word(*end)) skip_while(end, is_blank);
++end;
if (is_word(*end))
skip_while(end, is_word);
else if (is_punctuation(*end))
skip_while(end, is_punctuation);
return Selection(cursor, end); return Selection(cursor, end);
} }
@ -53,11 +79,12 @@ Selection select_to_next_word_end(const BufferIterator& cursor)
Selection select_to_previous_word(const BufferIterator& cursor) Selection select_to_previous_word(const BufferIterator& cursor)
{ {
BufferIterator end = cursor; BufferIterator end = cursor;
while (not end.is_end() and not is_word(*end))
--end;
while (not end.is_end() and is_word(*end)) skip_while_reverse(end, is_blank);
--end; if (is_word(*end))
skip_while_reverse(end, is_word);
else if (is_punctuation(*end))
skip_while_reverse(end, is_punctuation);
return Selection(cursor, end); return Selection(cursor, end);
} }