Merge remote-tracking branch 'krobelus/textobject-count'

src/selectors.cc

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

test/normal/object/end-extending/paragraph/count/cmd

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

test/normal/object/end-extending/paragraph/count/in

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

test/normal/object/end-extending/paragraph/count/kak_quoted_selections

@@ -0,0 +1,7 @@
+'a
+b
+
+c
+d
+
+'

test/normal/object/end-extending/sentence/count/cmd

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

test/normal/object/end-extending/sentence/count/in

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

test/normal/object/end-extending/sentence/count/kak_quoted_selections

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

test/normal/object/end/paragraph/count/cmd

@@ -0,0 +1 @@
+2]p

test/normal/object/end/paragraph/count/in

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

test/normal/object/end/paragraph/count/kak_quoted_selections

@@ -0,0 +1,7 @@
+'a
+b
+
+c
+d
+
+'

test/normal/object/end/paragraph/to-buffer-end/cmd

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

test/normal/object/end/paragraph/to-buffer-end/in

@@ -0,0 +1,4 @@
+%(a)
+b
+
+c

test/normal/object/end/paragraph/to-buffer-end/kak_quoted_selections

@@ -0,0 +1,5 @@
+'a
+b
+
+c
+'

test/normal/object/end/sentence/count/cmd

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

test/normal/object/end/sentence/count/in

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

test/normal/object/end/sentence/count/kak_quoted_selections

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

test/normal/object/end/sentence/to-buffer-end/cmd

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

test/normal/object/end/sentence/to-buffer-end/in

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

test/normal/object/end/sentence/to-buffer-end/kak_quoted_selections

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

test/normal/object/start-extending/paragraph/count/cmd

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

test/normal/object/start-extending/paragraph/count/in

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

test/normal/object/start-extending/paragraph/count/kak_quoted_selections

@@ -0,0 +1,5 @@
+'b
+
+c
+d
+e'

test/normal/object/start-extending/sentence/count/cmd

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

test/normal/object/start-extending/sentence/count/in

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

test/normal/object/start-extending/sentence/count/kak_quoted_selections

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

test/normal/object/start/paragraph/count/cmd

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

test/normal/object/start/paragraph/count/in

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

test/normal/object/start/paragraph/count/kak_quoted_selections

@@ -0,0 +1,5 @@
+'b
+c
+
+d
+e'

test/normal/object/start/sentence/count/cmd

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

test/normal/object/start/sentence/count/in

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

test/normal/object/start/sentence/count/kak_quoted_selections

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

test/normal/object/start/sentence/to-buffer-begin/cmd

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

test/normal/object/start/sentence/to-buffer-begin/in

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

test/normal/object/start/sentence/to-buffer-begin/kak_quoted_selections

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