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

Selectors: fix corner cases on first/last buffer char

Browse Source
This commit is contained in:
Maxime Coste 2011-11-24 18:46:35 +00:00
parent 30b4fb6513
commit 2549a63c0b
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/selectors.cc
View File

@ -56,17 +56,19 @@ static CharCategories categorize(char c)
} }
template<typename T> template<typename T>
void skip_while(BufferIterator& it, T condition) bool skip_while(BufferIterator& it, T condition)
{ {
while (not it.is_end() and condition(*it)) while (not it.is_end() and condition(*it))
++it; ++it;
return condition(*it);
} }
template<typename T> template<typename T>
void skip_while_reverse(BufferIterator& it, T condition) bool skip_while_reverse(BufferIterator& it, T condition)
{ {
while (not it.is_begin() and condition(*it)) while (not it.is_begin() and condition(*it))
--it; --it;
return condition(*it);
} }
Selection select_to_next_word(const BufferIterator& cursor) Selection select_to_next_word(const BufferIterator& cursor)
@ -84,9 +86,9 @@ Selection select_to_next_word(const BufferIterator& cursor)
else if (is_word(*begin)) else if (is_word(*begin))
skip_while(end, is_word); skip_while(end, is_word);
skip_while(end, is_blank); bool with_end = skip_while(end, is_blank);
return Selection(begin, end-1); return Selection(begin, with_end ? end : end-1);
} }
Selection select_to_next_word_end(const BufferIterator& cursor) Selection select_to_next_word_end(const BufferIterator& cursor)
@ -99,12 +101,13 @@ Selection select_to_next_word_end(const BufferIterator& cursor)
BufferIterator end = begin; BufferIterator end = begin;
skip_while(end, is_blank); skip_while(end, is_blank);
bool with_end = false;
if (is_punctuation(*end)) if (is_punctuation(*end))
skip_while(end, is_punctuation); with_end = skip_while(end, is_punctuation);
else if (is_word(*end)) else if (is_word(*end))
skip_while(end, is_word); with_end = skip_while(end, is_word);
return Selection(begin, end-1); return Selection(begin, with_end ? end : end-1);
} }
Selection select_to_previous_word(const BufferIterator& cursor) Selection select_to_previous_word(const BufferIterator& cursor)
@ -118,12 +121,13 @@ Selection select_to_previous_word(const BufferIterator& cursor)
BufferIterator end = begin; BufferIterator end = begin;
skip_while_reverse(end, is_blank); skip_while_reverse(end, is_blank);
bool with_end = false;
if (is_punctuation(*end)) if (is_punctuation(*end))
skip_while_reverse(end, is_punctuation); with_end = skip_while_reverse(end, is_punctuation);
else if (is_word(*end)) else if (is_word(*end))
skip_while_reverse(end, is_word); with_end = skip_while_reverse(end, is_word);
return Selection(begin, end+1); return Selection(begin, with_end ? end : end+1);
} }
Selection select_to_next_WORD(const BufferIterator& cursor) Selection select_to_next_WORD(const BufferIterator& cursor)
@ -137,9 +141,9 @@ Selection select_to_next_WORD(const BufferIterator& cursor)
BufferIterator end = begin+1; BufferIterator end = begin+1;
skip_while(end, [] (char c) { return !is_blank(c) and !is_eol(c); }); skip_while(end, [] (char c) { return !is_blank(c) and !is_eol(c); });
skip_while(end, is_blank); bool with_end = skip_while(end, is_blank);
return Selection(begin, end-1); return Selection(begin, with_end ? end : end-1);
} }
Selection select_to_next_WORD_end(const BufferIterator& cursor) Selection select_to_next_WORD_end(const BufferIterator& cursor)
@ -153,9 +157,10 @@ Selection select_to_next_WORD_end(const BufferIterator& cursor)
BufferIterator end = begin+1; BufferIterator end = begin+1;
skip_while(end, is_blank); skip_while(end, is_blank);
skip_while(end, [] (char c) { return !is_blank(c) and !is_eol(c); }); bool with_end = skip_while(end, [] (char c) { return !is_blank(c)
and !is_eol(c); });
return Selection(begin, end-1); return Selection(begin, with_end ? end : end-1);
} }
Selection select_to_previous_WORD(const BufferIterator& cursor) Selection select_to_previous_WORD(const BufferIterator& cursor)
@ -167,9 +172,10 @@ Selection select_to_previous_WORD(const BufferIterator& cursor)
skip_while_reverse(begin, is_eol); skip_while_reverse(begin, is_eol);
BufferIterator end = begin; BufferIterator end = begin;
skip_while_reverse(end, is_blank); skip_while_reverse(end, is_blank);
skip_while_reverse(end, [] (char c) { return !is_blank(c) and !is_eol(c); }); bool with_end = skip_while_reverse(end, [] (char c) { return !is_blank(c)
and !is_eol(c); });
return Selection(begin, end+1); return Selection(begin, with_end ? end : end+1);
} }
Selection select_line(const BufferIterator& cursor) Selection select_line(const BufferIterator& cursor)