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

Rework buggy number selection function

Browse Source 
Fixes #765
Fixes #766
This commit is contained in:
Maxime Coste 2016-08-22 13:52:37 +01:00
parent 0de4fc75d0
commit 56a7c6e594
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/selectors.cc
View File

@ -247,6 +247,10 @@ Selection select_number(const Buffer& buffer, const Selection& selection, Object
BufferIterator first = buffer.iterator_at(selection.cursor()); BufferIterator first = buffer.iterator_at(selection.cursor());
BufferIterator last = first; BufferIterator last = first;
if (not is_number(*first) and *first != '-')
return selection;
if (flags & ObjectFlags::ToBegin) if (flags & ObjectFlags::ToBegin)
{ {
skip_while_reverse(first, buffer.begin(), is_number); skip_while_reverse(first, buffer.begin(), is_number);
@ -257,8 +261,11 @@ Selection select_number(const Buffer& buffer, const Selection& selection, Object
if (flags & ObjectFlags::ToEnd) if (flags & ObjectFlags::ToEnd)
{ {
if (*last == '-')
++last;
skip_while(last, buffer.end(), is_number); skip_while(last, buffer.end(), is_number);
--last; if (last != buffer.begin())
--last;
} }
return (flags & ObjectFlags::ToEnd) ? Selection{first.coord(), last.coord()} return (flags & ObjectFlags::ToEnd) ? Selection{first.coord(), last.coord()}