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

Support count argument for [s and ]s

Browse Source 
Part of #795
This commit is contained in:
Johannes Altmanninger 2020-07-19 21:48:52 +02:00
parent 98a1afcab0
commit 266fe6f659
19 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/selectors.cc
View File

@ -494,7 +494,10 @@ select_sentence(const Context& context, const Selection& selection,
auto& buffer = context.buffer(); auto& buffer = context.buffer();
BufferIterator first = buffer.iterator_at(selection.cursor()); BufferIterator first = buffer.iterator_at(selection.cursor());
BufferIterator last;
for (++count; count > 0; --count)
{
if (not (flags & ObjectFlags::ToEnd) and first != buffer.begin()) if (not (flags & ObjectFlags::ToEnd) and first != buffer.begin())
{ {
BufferIterator prev_non_blank = first-1; BufferIterator prev_non_blank = first-1;
@ -504,7 +507,8 @@ select_sentence(const Context& context, const Selection& selection,
first = prev_non_blank; first = prev_non_blank;
} }
BufferIterator last = first; if (last == BufferIterator{})
last = first;
if (flags & ObjectFlags::ToBegin) if (flags & ObjectFlags::ToBegin)
{ {
@ -548,6 +552,7 @@ select_sentence(const Context& context, const Selection& selection,
--last; --last;
} }
} }
}
return (flags & ObjectFlags::ToEnd) ? Selection{first.coord(), last.coord()} return (flags & ObjectFlags::ToEnd) ? Selection{first.coord(), last.coord()}
: Selection{last.coord(), first.coord()}; : Selection{last.coord(), first.coord()};
} }

1
test/normal/object/end-extending/sentence/count/cmd Normal file
View File

@ -0,0 +1 @@
2}s

1
test/normal/object/end-extending/sentence/count/in Normal file
View File

@ -0,0 +1 @@
%(a b) c. d e. f.

1
test/normal/object/end-extending/sentence/count/kak_quoted_selections Normal file
View File

@ -0,0 +1 @@
'a b c. d e. '

1
test/normal/object/end/sentence/count/cmd Normal file
View File

@ -0,0 +1 @@
<a-;>2]s

1
test/normal/object/end/sentence/count/in Normal file
View File

@ -0,0 +1 @@
%(a b) c. d e. f g.

1
test/normal/object/end/sentence/count/kak_quoted_selections Normal file
View File

@ -0,0 +1 @@
'a b c. d e. '

1
test/normal/object/end/sentence/to-buffer-end/cmd Normal file
View File

@ -0,0 +1 @@
9]s

3
test/normal/object/end/sentence/to-buffer-end/in Normal file
View File

@ -0,0 +1,3 @@
a b.
c d.

1
test/normal/object/end/sentence/to-buffer-end/kak_quoted_selections Normal file
View File

@ -0,0 +1 @@
'a b.'

1
test/normal/object/start-extending/sentence/count/cmd Normal file
View File

@ -0,0 +1 @@
<a-;>2{s

1
test/normal/object/start-extending/sentence/count/in Normal file
View File

@ -0,0 +1 @@
a b. c d. e %(f g)

1
test/normal/object/start-extending/sentence/count/kak_quoted_selections Normal file
View File

@ -0,0 +1 @@
'c d. e f g'

1
test/normal/object/start/sentence/count/cmd Normal file
View File

@ -0,0 +1 @@
2[s

1
test/normal/object/start/sentence/count/in Normal file
View File

@ -0,0 +1 @@
a b. c d. e %(f)

1
test/normal/object/start/sentence/count/kak_quoted_selections Normal file
View File

@ -0,0 +1 @@
'c d. e f'

1
test/normal/object/start/sentence/to-buffer-begin/cmd Normal file
View File

@ -0,0 +1 @@
9[s

3
test/normal/object/start/sentence/to-buffer-begin/in Normal file
View File

@ -0,0 +1,3 @@
a b.
c d. %(e) f.

3
test/normal/object/start/sentence/to-buffer-begin/kak_quoted_selections Normal file
View File

@ -0,0 +1,3 @@
'a b.
c d.'