vim-patch:8.2.0660: the search.c file is a bit big (#19963)

Problem:    The search.c file is a bit big.
Solution:   Split off the text object code to a separate file. (Yegappan
            Lakshmanan, closes vim/vim#6007)
https://github.com/vim/vim/commit/ed8ce057b7a2fcd89b5f55680ae8f85d62a992a5

8 files changed, 1761 insertions, 1805 deletions

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 55f4d77feb..ed625e1d6e 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -57,6 +57,7 @@
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
 #include "nvim/textformat.h"
+#include "nvim/textobject.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index a15a27650b..c4b30ae600 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -33,9 +33,9 @@
 #include "nvim/os/time.h"
 #include "nvim/path.h"
 #include "nvim/quickfix.h"
-#include "nvim/search.h"
 #include "nvim/sign.h"
 #include "nvim/strings.h"
+#include "nvim/textobject.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 93ee49b0a4..31646f686d 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -66,6 +66,7 @@
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
 #include "nvim/textformat.h"
+#include "nvim/textobject.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 190ad72a8f..892d531633 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -2444,1808 +2444,6 @@ void showmatch(int c)
   }
 }
 
-// Find the start of the next sentence, searching in the direction specified
-// by the "dir" argument.  The cursor is positioned on the start of the next
-// sentence when found.  If the next sentence is found, return OK.  Return FAIL
-// otherwise.  See ":h sentence" for the precise definition of a "sentence"
-// text object.
-int findsent(Direction dir, long count)
-{
-  pos_T pos, tpos;
-  int c;
-  int (*func)(pos_T *);
-  bool noskip = false;              // do not skip blanks
-
-  pos = curwin->w_cursor;
-  if (dir == FORWARD) {
-    func = incl;
-  } else {
-    func = decl;
-  }
-
-  while (count--) {
-    const pos_T prev_pos = pos;
-
-    // if on an empty line, skip up to a non-empty line
-    if (gchar_pos(&pos) == NUL) {
-      do {
-        if ((*func)(&pos) == -1) {
-          break;
-        }
-      } while (gchar_pos(&pos) == NUL);
-      if (dir == FORWARD) {
-        goto found;
-      }
-      // if on the start of a paragraph or a section and searching forward,
-      // go to the next line
-    } else if (dir == FORWARD && pos.col == 0
-               && startPS(pos.lnum, NUL, false)) {
-      if (pos.lnum == curbuf->b_ml.ml_line_count) {
-        return FAIL;
-      }
-      pos.lnum++;
-      goto found;
-    } else if (dir == BACKWARD) {
-      decl(&pos);
-    }
-
-    // go back to the previous non-white non-punctuation character
-    bool found_dot = false;
-    while (c = gchar_pos(&pos), ascii_iswhite(c)
-           || vim_strchr(".!?)]\"'", c) != NULL) {
-      tpos = pos;
-      if (decl(&tpos) == -1 || (LINEEMPTY(tpos.lnum) && dir == FORWARD)) {
-        break;
-      }
-      if (found_dot) {
-        break;
-      }
-      if (vim_strchr(".!?", c) != NULL) {
-        found_dot = true;
-      }
-      if (vim_strchr(")]\"'", c) != NULL
-          && vim_strchr(".!?)]\"'", gchar_pos(&tpos)) == NULL) {
-        break;
-      }
-      decl(&pos);
-    }
-
-    // remember the line where the search started
-    const int startlnum = pos.lnum;
-    const bool cpo_J = vim_strchr(p_cpo, CPO_ENDOFSENT) != NULL;
-
-    for (;;) {                 // find end of sentence
-      c = gchar_pos(&pos);
-      if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, false))) {
-        if (dir == BACKWARD && pos.lnum != startlnum) {
-          pos.lnum++;
-        }
-        break;
-      }
-      if (c == '.' || c == '!' || c == '?') {
-        tpos = pos;
-        do {
-          if ((c = inc(&tpos)) == -1) {
-            break;
-          }
-        } while (vim_strchr(")]\"'", c = gchar_pos(&tpos))
-                 != NULL);
-        if (c == -1 || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL
-            || (cpo_J && (c == ' ' && inc(&tpos) >= 0
-                          && gchar_pos(&tpos) == ' '))) {
-          pos = tpos;
-          if (gchar_pos(&pos) == NUL) {         // skip NUL at EOL
-            inc(&pos);
-          }
-          break;
-        }
-      }
-      if ((*func)(&pos) == -1) {
-        if (count) {
-          return FAIL;
-        }
-        noskip = true;
-        break;
-      }
-    }
-found:
-    // skip white space
-    while (!noskip && ((c = gchar_pos(&pos)) == ' ' || c == '\t')) {
-      if (incl(&pos) == -1) {
-        break;
-      }
-    }
-
-    if (equalpos(prev_pos, pos)) {
-      // didn't actually move, advance one character and try again
-      if ((*func)(&pos) == -1) {
-        if (count) {
-          return FAIL;
-        }
-        break;
-      }
-      count++;
-    }
-  }
-
-  setpcmark();
-  curwin->w_cursor = pos;
-  return OK;
-}
-
-/// Find the next paragraph or section in direction 'dir'.
-/// Paragraphs are currently supposed to be separated by empty lines.
-/// If 'what' is NUL we go to the next paragraph.
-/// If 'what' is '{' or '}' we go to the next section.
-/// If 'both' is true also stop at '}'.
-///
-/// @param pincl  Return: true if last char is to be included
-///
-/// @return       true if the next paragraph or section was found.
-bool findpar(bool *pincl, int dir, long count, int what, int both)
-{
-  linenr_T curr;
-  bool did_skip;            // true after separating lines have been skipped
-  bool first;               // true on first line
-  linenr_T fold_first;      // first line of a closed fold
-  linenr_T fold_last;       // last line of a closed fold
-  bool fold_skipped;        // true if a closed fold was skipped this
-                            // iteration
-
-  curr = curwin->w_cursor.lnum;
-
-  while (count--) {
-    did_skip = false;
-    for (first = true;; first = false) {
-      if (*ml_get(curr) != NUL) {
-        did_skip = true;
-      }
-
-      // skip folded lines
-      fold_skipped = false;
-      if (first && hasFolding(curr, &fold_first, &fold_last)) {
-        curr = ((dir > 0) ? fold_last : fold_first) + dir;
-        fold_skipped = true;
-      }
-
-      if (!first && did_skip && startPS(curr, what, both)) {
-        break;
-      }
-
-      if (fold_skipped) {
-        curr -= dir;
-      }
-      if ((curr += dir) < 1 || curr > curbuf->b_ml.ml_line_count) {
-        if (count) {
-          return false;
-        }
-        curr -= dir;
-        break;
-      }
-    }
-  }
-  setpcmark();
-  if (both && *ml_get(curr) == '}') {   // include line with '}'
-    curr++;
-  }
-  curwin->w_cursor.lnum = curr;
-  if (curr == curbuf->b_ml.ml_line_count && what != '}') {
-    char_u *line = ml_get(curr);
-
-    // Put the cursor on the last character in the last line and make the
-    // motion inclusive.
-    if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0) {
-      curwin->w_cursor.col--;
-      curwin->w_cursor.col -= utf_head_off(line, line + curwin->w_cursor.col);
-      *pincl = true;
-    }
-  } else {
-    curwin->w_cursor.col = 0;
-  }
-  return true;
-}
-
-/*
- * check if the string 's' is a nroff macro that is in option 'opt'
- */
-static int inmacro(char_u *opt, char_u *s)
-{
-  char_u *macro;
-
-  for (macro = opt; macro[0]; macro++) {
-    // Accept two characters in the option being equal to two characters
-    // in the line.  A space in the option matches with a space in the
-    // line or the line having ended.
-    if ((macro[0] == s[0]
-         || (macro[0] == ' '
-             && (s[0] == NUL || s[0] == ' ')))
-        && (macro[1] == s[1]
-            || ((macro[1] == NUL || macro[1] == ' ')
-                && (s[0] == NUL || s[1] == NUL || s[1] == ' ')))) {
-      break;
-    }
-    macro++;
-    if (macro[0] == NUL) {
-      break;
-    }
-  }
-  return macro[0] != NUL;
-}
-
-/// startPS: return true if line 'lnum' is the start of a section or paragraph.
-/// If 'para' is '{' or '}' only check for sections.
-/// If 'both' is true also stop at '}'
-int startPS(linenr_T lnum, int para, int both)
-{
-  char_u *s;
-
-  s = ml_get(lnum);
-  if (*s == para || *s == '\f' || (both && *s == '}')) {
-    return true;
-  }
-  if (*s == '.' && (inmacro((char_u *)p_sections, s + 1)
-                    || (!para && inmacro(p_para, s + 1)))) {
-    return true;
-  }
-  return false;
-}
-
-/*
- * The following routines do the word searches performed by the 'w', 'W',
- * 'b', 'B', 'e', and 'E' commands.
- */
-
-/*
- * To perform these searches, characters are placed into one of three
- * classes, and transitions between classes determine word boundaries.
- *
- * The classes are:
- *
- * 0 - white space
- * 1 - punctuation
- * 2 or higher - keyword characters (letters, digits and underscore)
- */
-
-static int cls_bigword;         // true for "W", "B" or "E"
-
-/*
- * cls() - returns the class of character at curwin->w_cursor
- *
- * If a 'W', 'B', or 'E' motion is being done (cls_bigword == true), chars
- * from class 2 and higher are reported as class 1 since only white space
- * boundaries are of interest.
- */
-static int cls(void)
-{
-  int c;
-
-  c = gchar_cursor();
-  if (c == ' ' || c == '\t' || c == NUL) {
-    return 0;
-  }
-
-  c = utf_class(c);
-
-  // If cls_bigword is true, report all non-blanks as class 1.
-  if (c != 0 && cls_bigword) {
-    return 1;
-  }
-  return c;
-}
-
-/// fwd_word(count, type, eol) - move forward one word
-///
-/// @return  FAIL if the cursor was already at the end of the file.
-/// If eol is true, last word stops at end of line (for operators).
-///
-/// @param bigword  "W", "E" or "B"
-int fwd_word(long count, int bigword, int eol)
-{
-  int sclass;               // starting class
-  int i;
-  int last_line;
-
-  curwin->w_cursor.coladd = 0;
-  cls_bigword = bigword;
-  while (--count >= 0) {
-    // When inside a range of folded lines, move to the last char of the
-    // last line.
-    if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) {
-      coladvance(MAXCOL);
-    }
-    sclass = cls();
-
-    /*
-     * We always move at least one character, unless on the last
-     * character in the buffer.
-     */
-    last_line = (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count);
-    i = inc_cursor();
-    if (i == -1 || (i >= 1 && last_line)) {   // started at last char in file
-      return FAIL;
-    }
-    if (i >= 1 && eol && count == 0) {        // started at last char in line
-      return OK;
-    }
-
-    /*
-     * Go one char past end of current word (if any)
-     */
-    if (sclass != 0) {
-      while (cls() == sclass) {
-        i = inc_cursor();
-        if (i == -1 || (i >= 1 && eol && count == 0)) {
-          return OK;
-        }
-      }
-    }
-
-    /*
-     * go to next non-white
-     */
-    while (cls() == 0) {
-      /*
-       * We'll stop if we land on a blank line
-       */
-      if (curwin->w_cursor.col == 0 && *get_cursor_line_ptr() == NUL) {
-        break;
-      }
-
-      i = inc_cursor();
-      if (i == -1 || (i >= 1 && eol && count == 0)) {
-        return OK;
-      }
-    }
-  }
-  return OK;
-}
-
-/*
- * bck_word() - move backward 'count' words
- *
- * If stop is true and we are already on the start of a word, move one less.
- *
- * Returns FAIL if top of the file was reached.
- */
-int bck_word(long count, int bigword, int stop)
-{
-  int sclass;               // starting class
-
-  curwin->w_cursor.coladd = 0;
-  cls_bigword = bigword;
-  while (--count >= 0) {
-    /* When inside a range of folded lines, move to the first char of the
-     * first line. */
-    if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL)) {
-      curwin->w_cursor.col = 0;
-    }
-    sclass = cls();
-    if (dec_cursor() == -1) {           // started at start of file
-      return FAIL;
-    }
-
-    if (!stop || sclass == cls() || sclass == 0) {
-      /*
-       * Skip white space before the word.
-       * Stop on an empty line.
-       */
-      while (cls() == 0) {
-        if (curwin->w_cursor.col == 0
-            && LINEEMPTY(curwin->w_cursor.lnum)) {
-          goto finished;
-        }
-        if (dec_cursor() == -1) {       // hit start of file, stop here
-          return OK;
-        }
-      }
-
-      /*
-       * Move backward to start of this word.
-       */
-      if (skip_chars(cls(), BACKWARD)) {
-        return OK;
-      }
-    }
-
-    inc_cursor();                       // overshot - forward one
-finished:
-    stop = false;
-  }
-  return OK;
-}
-
-/*
- * end_word() - move to the end of the word
- *
- * There is an apparent bug in the 'e' motion of the real vi. At least on the
- * System V Release 3 version for the 80386. Unlike 'b' and 'w', the 'e'
- * motion crosses blank lines. When the real vi crosses a blank line in an
- * 'e' motion, the cursor is placed on the FIRST character of the next
- * non-blank line. The 'E' command, however, works correctly. Since this
- * appears to be a bug, I have not duplicated it here.
- *
- * Returns FAIL if end of the file was reached.
- *
- * If stop is true and we are already on the end of a word, move one less.
- * If empty is true stop on an empty line.
- */
-int end_word(long count, int bigword, int stop, int empty)
-{
-  int sclass;               // starting class
-
-  curwin->w_cursor.coladd = 0;
-  cls_bigword = bigword;
-  while (--count >= 0) {
-    /* When inside a range of folded lines, move to the last char of the
-     * last line. */
-    if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) {
-      coladvance(MAXCOL);
-    }
-    sclass = cls();
-    if (inc_cursor() == -1) {
-      return FAIL;
-    }
-
-    /*
-     * If we're in the middle of a word, we just have to move to the end
-     * of it.
-     */
-    if (cls() == sclass && sclass != 0) {
-      /*
-       * Move forward to end of the current word
-       */
-      if (skip_chars(sclass, FORWARD)) {
-        return FAIL;
-      }
-    } else if (!stop || sclass == 0) {
-      /*
-       * We were at the end of a word. Go to the end of the next word.
-       * First skip white space, if 'empty' is true, stop at empty line.
-       */
-      while (cls() == 0) {
-        if (empty && curwin->w_cursor.col == 0
-            && LINEEMPTY(curwin->w_cursor.lnum)) {
-          goto finished;
-        }
-        if (inc_cursor() == -1) {           // hit end of file, stop here
-          return FAIL;
-        }
-      }
-
-      /*
-       * Move forward to the end of this word.
-       */
-      if (skip_chars(cls(), FORWARD)) {
-        return FAIL;
-      }
-    }
-    dec_cursor();                       // overshot - one char backward
-finished:
-    stop = false;                       // we move only one word less
-  }
-  return OK;
-}
-
-/// Move back to the end of the word.
-///
-/// @param bigword  true for "B"
-/// @param eol      if true, then stop at end of line.
-///
-/// @return         FAIL if start of the file was reached.
-int bckend_word(long count, int bigword, bool eol)
-{
-  int sclass;               // starting class
-  int i;
-
-  curwin->w_cursor.coladd = 0;
-  cls_bigword = bigword;
-  while (--count >= 0) {
-    sclass = cls();
-    if ((i = dec_cursor()) == -1) {
-      return FAIL;
-    }
-    if (eol && i == 1) {
-      return OK;
-    }
-
-    /*
-     * Move backward to before the start of this word.
-     */
-    if (sclass != 0) {
-      while (cls() == sclass) {
-        if ((i = dec_cursor()) == -1 || (eol && i == 1)) {
-          return OK;
-        }
-      }
-    }
-
-    /*
-     * Move backward to end of the previous word
-     */
-    while (cls() == 0) {
-      if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum)) {
-        break;
-      }
-      if ((i = dec_cursor()) == -1 || (eol && i == 1)) {
-        return OK;
-      }
-    }
-  }
-  return OK;
-}
-
-/// Skip a row of characters of the same class.
-///
-/// @return  true when end-of-file reached, false otherwise.
-static bool skip_chars(int cclass, int dir)
-{
-  while (cls() == cclass) {
-    if ((dir == FORWARD ? inc_cursor() : dec_cursor()) == -1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/*
- * Go back to the start of the word or the start of white space
- */
-static void back_in_line(void)
-{
-  int sclass;                       // starting class
-
-  sclass = cls();
-  for (;;) {
-    if (curwin->w_cursor.col == 0) {        // stop at start of line
-      break;
-    }
-    dec_cursor();
-    if (cls() != sclass) {                  // stop at start of word
-      inc_cursor();
-      break;
-    }
-  }
-}
-
-static void find_first_blank(pos_T *posp)
-{
-  int c;
-
-  while (decl(posp) != -1) {
-    c = gchar_pos(posp);
-    if (!ascii_iswhite(c)) {
-      incl(posp);
-      break;
-    }
-  }
-}
-
-/// Skip count/2 sentences and count/2 separating white spaces.
-///
-/// @param at_start_sent  cursor is at start of sentence
-static void findsent_forward(long count, bool at_start_sent)
-{
-  while (count--) {
-    findsent(FORWARD, 1L);
-    if (at_start_sent) {
-      find_first_blank(&curwin->w_cursor);
-    }
-    if (count == 0 || at_start_sent) {
-      decl(&curwin->w_cursor);
-    }
-    at_start_sent = !at_start_sent;
-  }
-}
-
-/// Find word under cursor, cursor at end.
-/// Used while an operator is pending, and in Visual mode.
-///
-/// @param include  true: include word and white space
-/// @param bigword  false == word, true == WORD
-int current_word(oparg_T *oap, long count, int include, int bigword)
-{
-  pos_T start_pos;
-  pos_T pos;
-  bool inclusive = true;
-  int include_white = false;
-
-  cls_bigword = bigword;
-  clearpos(&start_pos);
-
-  // Correct cursor when 'selection' is exclusive
-  if (VIsual_active && *p_sel == 'e' && lt(VIsual, curwin->w_cursor)) {
-    dec_cursor();
-  }
-
-  /*
-   * When Visual mode is not active, or when the VIsual area is only one
-   * character, select the word and/or white space under the cursor.
-   */
-  if (!VIsual_active || equalpos(curwin->w_cursor, VIsual)) {
-    /*
-     * Go to start of current word or white space.
-     */
-    back_in_line();
-    start_pos = curwin->w_cursor;
-
-    /*
-     * If the start is on white space, and white space should be included
-     * (" word"), or start is not on white space, and white space should
-     * not be included ("word"), find end of word.
-     */
-    if ((cls() == 0) == include) {
-      if (end_word(1L, bigword, true, true) == FAIL) {
-        return FAIL;
-      }
-    } else {
-      /*
-       * If the start is not on white space, and white space should be
-       * included ("word   "), or start is on white space and white
-       * space should not be included ("   "), find start of word.
-       * If we end up in the first column of the next line (single char
-       * word) back up to end of the line.
-       */
-      fwd_word(1L, bigword, true);
-      if (curwin->w_cursor.col == 0) {
-        decl(&curwin->w_cursor);
-      } else {
-        oneleft();
-      }
-
-      if (include) {
-        include_white = true;
-      }
-    }
-
-    if (VIsual_active) {
-      // should do something when inclusive == false !
-      VIsual = start_pos;
-      redraw_curbuf_later(UPD_INVERTED);  // update the inversion
-    } else {
-      oap->start = start_pos;
-      oap->motion_type = kMTCharWise;
-    }
-    count--;
-  }
-
-  /*
-   * When count is still > 0, extend with more objects.
-   */
-  while (count > 0) {
-    inclusive = true;
-    if (VIsual_active && lt(curwin->w_cursor, VIsual)) {
-      /*
-       * In Visual mode, with cursor at start: move cursor back.
-       */
-      if (decl(&curwin->w_cursor) == -1) {
-        return FAIL;
-      }
-      if (include != (cls() != 0)) {
-        if (bck_word(1L, bigword, true) == FAIL) {
-          return FAIL;
-        }
-      } else {
-        if (bckend_word(1L, bigword, true) == FAIL) {
-          return FAIL;
-        }
-        (void)incl(&curwin->w_cursor);
-      }
-    } else {
-      /*
-       * Move cursor forward one word and/or white area.
-       */
-      if (incl(&curwin->w_cursor) == -1) {
-        return FAIL;
-      }
-      if (include != (cls() == 0)) {
-        if (fwd_word(1L, bigword, true) == FAIL && count > 1) {
-          return FAIL;
-        }
-        /*
-         * If end is just past a new-line, we don't want to include
-         * the first character on the line.
-         * Put cursor on last char of white.
-         */
-        if (oneleft() == FAIL) {
-          inclusive = false;
-        }
-      } else {
-        if (end_word(1L, bigword, true, true) == FAIL) {
-          return FAIL;
-        }
-      }
-    }
-    count--;
-  }
-
-  if (include_white && (cls() != 0
-                        || (curwin->w_cursor.col == 0 && !inclusive))) {
-    /*
-     * If we don't include white space at the end, move the start
-     * to include some white space there. This makes "daw" work
-     * better on the last word in a sentence (and "2daw" on last-but-one
-     * word).  Also when "2daw" deletes "word." at the end of the line
-     * (cursor is at start of next line).
-     * But don't delete white space at start of line (indent).
-     */
-    pos = curwin->w_cursor;     // save cursor position
-    curwin->w_cursor = start_pos;
-    if (oneleft() == OK) {
-      back_in_line();
-      if (cls() == 0 && curwin->w_cursor.col > 0) {
-        if (VIsual_active) {
-          VIsual = curwin->w_cursor;
-        } else {
-          oap->start = curwin->w_cursor;
-        }
-      }
-    }
-    curwin->w_cursor = pos;     // put cursor back at end
-  }
-
-  if (VIsual_active) {
-    if (*p_sel == 'e' && inclusive && ltoreq(VIsual, curwin->w_cursor)) {
-      inc_cursor();
-    }
-    if (VIsual_mode == 'V') {
-      VIsual_mode = 'v';
-      redraw_cmdline = true;                    // show mode later
-    }
-  } else {
-    oap->inclusive = inclusive;
-  }
-
-  return OK;
-}
-
-/*
- * Find sentence(s) under the cursor, cursor at end.
- * When Visual active, extend it by one or more sentences.
- */
-int current_sent(oparg_T *oap, long count, int include)
-{
-  pos_T start_pos;
-  pos_T pos;
-  bool start_blank;
-  int c;
-  bool at_start_sent;
-  long ncount;
-
-  start_pos = curwin->w_cursor;
-  pos = start_pos;
-  findsent(FORWARD, 1L);        // Find start of next sentence.
-
-  /*
-   * When the Visual area is bigger than one character: Extend it.
-   */
-  if (VIsual_active && !equalpos(start_pos, VIsual)) {
-extend:
-    if (lt(start_pos, VIsual)) {
-      /*
-       * Cursor at start of Visual area.
-       * Find out where we are:
-       * - in the white space before a sentence
-       * - in a sentence or just after it
-       * - at the start of a sentence
-       */
-      at_start_sent = true;
-      decl(&pos);
-      while (lt(pos, curwin->w_cursor)) {
-        c = gchar_pos(&pos);
-        if (!ascii_iswhite(c)) {
-          at_start_sent = false;
-          break;
-        }
-        incl(&pos);
-      }
-      if (!at_start_sent) {
-        findsent(BACKWARD, 1L);
-        if (equalpos(curwin->w_cursor, start_pos)) {
-          at_start_sent = true;            // exactly at start of sentence
-        } else {
-          // inside a sentence, go to its end (start of next)
-          findsent(FORWARD, 1L);
-        }
-      }
-      if (include) {            // "as" gets twice as much as "is"
-        count *= 2;
-      }
-      while (count--) {
-        if (at_start_sent) {
-          find_first_blank(&curwin->w_cursor);
-        }
-        c = gchar_cursor();
-        if (!at_start_sent || (!include && !ascii_iswhite(c))) {
-          findsent(BACKWARD, 1L);
-        }
-        at_start_sent = !at_start_sent;
-      }
-    } else {
-      /*
-       * Cursor at end of Visual area.
-       * Find out where we are:
-       * - just before a sentence
-       * - just before or in the white space before a sentence
-       * - in a sentence
-       */
-      incl(&pos);
-      at_start_sent = true;
-      if (!equalpos(pos, curwin->w_cursor)) {     // not just before a sentence
-        at_start_sent = false;
-        while (lt(pos, curwin->w_cursor)) {
-          c = gchar_pos(&pos);
-          if (!ascii_iswhite(c)) {
-            at_start_sent = true;
-            break;
-          }
-          incl(&pos);
-        }
-        if (at_start_sent) {            // in the sentence
-          findsent(BACKWARD, 1L);
-        } else {  // in/before white before a sentence
-          curwin->w_cursor = start_pos;
-        }
-      }
-
-      if (include) {            // "as" gets twice as much as "is"
-        count *= 2;
-      }
-      findsent_forward(count, at_start_sent);
-      if (*p_sel == 'e') {
-        curwin->w_cursor.col++;
-      }
-    }
-    return OK;
-  }
-
-  /*
-   * If the cursor started on a blank, check if it is just before the start
-   * of the next sentence.
-   */
-  while (c = gchar_pos(&pos), ascii_iswhite(c)) {
-    incl(&pos);
-  }
-  if (equalpos(pos, curwin->w_cursor)) {
-    start_blank = true;
-    find_first_blank(&start_pos);       // go back to first blank
-  } else {
-    start_blank = false;
-    findsent(BACKWARD, 1L);
-    start_pos = curwin->w_cursor;
-  }
-  if (include) {
-    ncount = count * 2;
-  } else {
-    ncount = count;
-    if (start_blank) {
-      ncount--;
-    }
-  }
-  if (ncount > 0) {
-    findsent_forward(ncount, true);
-  } else {
-    decl(&curwin->w_cursor);
-  }
-
-  if (include) {
-    /*
-     * If the blank in front of the sentence is included, exclude the
-     * blanks at the end of the sentence, go back to the first blank.
-     * If there are no trailing blanks, try to include leading blanks.
-     */
-    if (start_blank) {
-      find_first_blank(&curwin->w_cursor);
-      c = gchar_pos(&curwin->w_cursor);
-      if (ascii_iswhite(c)) {
-        decl(&curwin->w_cursor);
-      }
-    } else if (c = gchar_cursor(), !ascii_iswhite(c)) {
-      find_first_blank(&start_pos);
-    }
-  }
-
-  if (VIsual_active) {
-    // Avoid getting stuck with "is" on a single space before a sentence.
-    if (equalpos(start_pos, curwin->w_cursor)) {
-      goto extend;
-    }
-    if (*p_sel == 'e') {
-      curwin->w_cursor.col++;
-    }
-    VIsual = start_pos;
-    VIsual_mode = 'v';
-    redraw_cmdline = true;    // show mode later
-    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
-  } else {
-    // include a newline after the sentence, if there is one
-    if (incl(&curwin->w_cursor) == -1) {
-      oap->inclusive = true;
-    } else {
-      oap->inclusive = false;
-    }
-    oap->start = start_pos;
-    oap->motion_type = kMTCharWise;
-  }
-  return OK;
-}
-
-/// Find block under the cursor, cursor at end.
-/// "what" and "other" are two matching parenthesis/brace/etc.
-///
-/// @param include  true == include white space
-/// @param what     '(', '{', etc.
-/// @param other    ')', '}', etc.
-int current_block(oparg_T *oap, long count, int include, int what, int other)
-{
-  pos_T old_pos;
-  pos_T *pos = NULL;
-  pos_T start_pos;
-  pos_T *end_pos;
-  pos_T old_start, old_end;
-  char *save_cpo;
-  bool sol = false;                      // '{' at start of line
-
-  old_pos = curwin->w_cursor;
-  old_end = curwin->w_cursor;           // remember where we started
-  old_start = old_end;
-
-  /*
-   * If we start on '(', '{', ')', '}', etc., use the whole block inclusive.
-   */
-  if (!VIsual_active || equalpos(VIsual, curwin->w_cursor)) {
-    setpcmark();
-    if (what == '{') {                  // ignore indent
-      while (inindent(1)) {
-        if (inc_cursor() != 0) {
-          break;
-        }
-      }
-    }
-    if (gchar_cursor() == what) {
-      // cursor on '(' or '{', move cursor just after it
-      curwin->w_cursor.col++;
-    }
-  } else if (lt(VIsual, curwin->w_cursor)) {
-    old_start = VIsual;
-    curwin->w_cursor = VIsual;              // cursor at low end of Visual
-  } else {
-    old_end = VIsual;
-  }
-
-  // Search backwards for unclosed '(', '{', etc..
-  // Put this position in start_pos.
-  // Ignore quotes here.  Keep the "M" flag in 'cpo', as that is what the
-  // user wants.
-  save_cpo = p_cpo;
-  p_cpo = vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%";
-  if ((pos = findmatch(NULL, what)) != NULL) {
-    while (count-- > 0) {
-      if ((pos = findmatch(NULL, what)) == NULL) {
-        break;
-      }
-      curwin->w_cursor = *pos;
-      start_pos = *pos;   // the findmatch for end_pos will overwrite *pos
-    }
-  } else {
-    while (count-- > 0) {
-      if ((pos = findmatchlimit(NULL, what, FM_FORWARD, 0)) == NULL) {
-        break;
-      }
-      curwin->w_cursor = *pos;
-      start_pos = *pos;   // the findmatch for end_pos will overwrite *pos
-    }
-  }
-  p_cpo = save_cpo;
-
-  /*
-   * Search for matching ')', '}', etc.
-   * Put this position in curwin->w_cursor.
-   */
-  if (pos == NULL || (end_pos = findmatch(NULL, other)) == NULL) {
-    curwin->w_cursor = old_pos;
-    return FAIL;
-  }
-  curwin->w_cursor = *end_pos;
-
-  // Try to exclude the '(', '{', ')', '}', etc. when "include" is false.
-  // If the ending '}', ')' or ']' is only preceded by indent, skip that
-  // indent. But only if the resulting area is not smaller than what we
-  // started with.
-  while (!include) {
-    incl(&start_pos);
-    sol = (curwin->w_cursor.col == 0);
-    decl(&curwin->w_cursor);
-    while (inindent(1)) {
-      sol = true;
-      if (decl(&curwin->w_cursor) != 0) {
-        break;
-      }
-    }
-
-    // In Visual mode, when the resulting area is not bigger than what we
-    // started with, extend it to the next block, and then exclude again.
-    // Don't try to expand the area if the area is empty.
-    if (!lt(start_pos, old_start) && !lt(old_end, curwin->w_cursor)
-        && !equalpos(start_pos, curwin->w_cursor)
-        && VIsual_active) {
-      curwin->w_cursor = old_start;
-      decl(&curwin->w_cursor);
-      if ((pos = findmatch(NULL, what)) == NULL) {
-        curwin->w_cursor = old_pos;
-        return FAIL;
-      }
-      start_pos = *pos;
-      curwin->w_cursor = *pos;
-      if ((end_pos = findmatch(NULL, other)) == NULL) {
-        curwin->w_cursor = old_pos;
-        return FAIL;
-      }
-      curwin->w_cursor = *end_pos;
-    } else {
-      break;
-    }
-  }
-
-  if (VIsual_active) {
-    if (*p_sel == 'e') {
-      inc(&curwin->w_cursor);
-    }
-    if (sol && gchar_cursor() != NUL) {
-      inc(&curwin->w_cursor);  // include the line break
-    }
-    VIsual = start_pos;
-    VIsual_mode = 'v';
-    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
-    showmode();
-  } else {
-    oap->start = start_pos;
-    oap->motion_type = kMTCharWise;
-    oap->inclusive = false;
-    if (sol) {
-      incl(&curwin->w_cursor);
-    } else if (ltoreq(start_pos, curwin->w_cursor)) {
-      // Include the character under the cursor.
-      oap->inclusive = true;
-    } else {
-      // End is before the start (no text in between <>, [], etc.): don't
-      // operate on any text.
-      curwin->w_cursor = start_pos;
-    }
-  }
-
-  return OK;
-}
-
-/// @param end_tag  when true, return true if the cursor is on "</aaa>".
-///
-/// @return         true if the cursor is on a "<aaa>" tag.  Ignore "<aaa/>".
-static bool in_html_tag(bool end_tag)
-{
-  char_u *line = get_cursor_line_ptr();
-  char_u *p;
-  int c;
-  int lc = NUL;
-  pos_T pos;
-
-  for (p = line + curwin->w_cursor.col; p > line;) {
-    if (*p == '<') {           // find '<' under/before cursor
-      break;
-    }
-    MB_PTR_BACK(line, p);
-    if (*p == '>') {           // find '>' before cursor
-      break;
-    }
-  }
-  if (*p != '<') {
-    return false;
-  }
-
-  pos.lnum = curwin->w_cursor.lnum;
-  pos.col = (colnr_T)(p - line);
-
-  MB_PTR_ADV(p);
-  if (end_tag) {
-    // check that there is a '/' after the '<'
-    return *p == '/';
-  }
-
-  // check that there is no '/' after the '<'
-  if (*p == '/') {
-    return false;
-  }
-
-  // check that the matching '>' is not preceded by '/'
-  for (;;) {
-    if (inc(&pos) < 0) {
-      return false;
-    }
-    c = *ml_get_pos(&pos);
-    if (c == '>') {
-      break;
-    }
-    lc = c;
-  }
-  return lc != '/';
-}
-
-/// Find tag block under the cursor, cursor at end.
-///
-/// @param include  true == include white space
-int current_tagblock(oparg_T *oap, long count_arg, bool include)
-{
-  long count = count_arg;
-  pos_T old_pos;
-  pos_T start_pos;
-  pos_T end_pos;
-  pos_T old_start, old_end;
-  char_u *p;
-  char_u *cp;
-  int len;
-  bool do_include = include;
-  bool save_p_ws = p_ws;
-  int retval = FAIL;
-  int is_inclusive = true;
-
-  p_ws = false;
-
-  old_pos = curwin->w_cursor;
-  old_end = curwin->w_cursor;               // remember where we started
-  old_start = old_end;
-  if (!VIsual_active || *p_sel == 'e') {
-    decl(&old_end);                         // old_end is inclusive
-  }
-  /*
-   * If we start on "<aaa>" select that block.
-   */
-  if (!VIsual_active || equalpos(VIsual, curwin->w_cursor)) {
-    setpcmark();
-
-    // ignore indent
-    while (inindent(1)) {
-      if (inc_cursor() != 0) {
-        break;
-      }
-    }
-
-    if (in_html_tag(false)) {
-      // cursor on start tag, move to its '>'
-      while (*get_cursor_pos_ptr() != '>') {
-        if (inc_cursor() < 0) {
-          break;
-        }
-      }
-    } else if (in_html_tag(true)) {
-      // cursor on end tag, move to just before it
-      while (*get_cursor_pos_ptr() != '<') {
-        if (dec_cursor() < 0) {
-          break;
-        }
-      }
-      dec_cursor();
-      old_end = curwin->w_cursor;
-    }
-  } else if (lt(VIsual, curwin->w_cursor)) {
-    old_start = VIsual;
-    curwin->w_cursor = VIsual;              // cursor at low end of Visual
-  } else {
-    old_end = VIsual;
-  }
-
-again:
-  /*
-   * Search backwards for unclosed "<aaa>".
-   * Put this position in start_pos.
-   */
-  for (long n = 0; n < count; n++) {
-    if (do_searchpair("<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)",
-                      "",
-                      "</[^>]*>", BACKWARD, NULL, 0,
-                      NULL, (linenr_T)0, 0L) <= 0) {
-      curwin->w_cursor = old_pos;
-      goto theend;
-    }
-  }
-  start_pos = curwin->w_cursor;
-
-  /*
-   * Search for matching "</aaa>".  First isolate the "aaa".
-   */
-  inc_cursor();
-  p = get_cursor_pos_ptr();
-  for (cp = p;
-       *cp != NUL && *cp != '>' && !ascii_iswhite(*cp);
-       MB_PTR_ADV(cp)) {}
-  len = (int)(cp - p);
-  if (len == 0) {
-    curwin->w_cursor = old_pos;
-    goto theend;
-  }
-  const size_t spat_len = (size_t)len + 39;
-  char *const spat = xmalloc(spat_len);
-  const size_t epat_len = (size_t)len + 9;
-  char *const epat = xmalloc(epat_len);
-  snprintf(spat, spat_len,
-           "<%.*s\\>\\%%(\\_s\\_[^>]\\{-}\\_[^/]>\\|\\_s\\?>\\)\\c", len, p);
-  snprintf(epat, epat_len, "</%.*s>\\c", len, p);
-
-  const int r = (int)do_searchpair(spat, "", epat, FORWARD, NULL, 0, NULL, (linenr_T)0, 0L);
-
-  xfree(spat);
-  xfree(epat);
-
-  if (r < 1 || lt(curwin->w_cursor, old_end)) {
-    // Can't find other end or it's before the previous end.  Could be a
-    // HTML tag that doesn't have a matching end.  Search backwards for
-    // another starting tag.
-    count = 1;
-    curwin->w_cursor = start_pos;
-    goto again;
-  }
-
-  if (do_include) {
-    // Include up to the '>'.
-    while (*get_cursor_pos_ptr() != '>') {
-      if (inc_cursor() < 0) {
-        break;
-      }
-    }
-  } else {
-    char_u *c = get_cursor_pos_ptr();
-    // Exclude the '<' of the end tag.
-    // If the closing tag is on new line, do not decrement cursor, but make
-    // operation exclusive, so that the linefeed will be selected
-    if (*c == '<' && !VIsual_active && curwin->w_cursor.col == 0) {
-      // do not decrement cursor
-      is_inclusive = false;
-    } else if (*c == '<') {
-      dec_cursor();
-    }
-  }
-  end_pos = curwin->w_cursor;
-
-  if (!do_include) {
-    // Exclude the start tag.
-    curwin->w_cursor = start_pos;
-    while (inc_cursor() >= 0) {
-      if (*get_cursor_pos_ptr() == '>') {
-        inc_cursor();
-        start_pos = curwin->w_cursor;
-        break;
-      }
-    }
-    curwin->w_cursor = end_pos;
-
-    // If we are in Visual mode and now have the same text as before set
-    // "do_include" and try again.
-    if (VIsual_active
-        && equalpos(start_pos, old_start)
-        && equalpos(end_pos, old_end)) {
-      do_include = true;
-      curwin->w_cursor = old_start;
-      count = count_arg;
-      goto again;
-    }
-  }
-
-  if (VIsual_active) {
-    // If the end is before the start there is no text between tags, select
-    // the char under the cursor.
-    if (lt(end_pos, start_pos)) {
-      curwin->w_cursor = start_pos;
-    } else if (*p_sel == 'e') {
-      inc_cursor();
-    }
-    VIsual = start_pos;
-    VIsual_mode = 'v';
-    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
-    showmode();
-  } else {
-    oap->start = start_pos;
-    oap->motion_type = kMTCharWise;
-    if (lt(end_pos, start_pos)) {
-      // End is before the start: there is no text between tags; operate
-      // on an empty area.
-      curwin->w_cursor = start_pos;
-      oap->inclusive = false;
-    } else {
-      oap->inclusive = is_inclusive;
-    }
-  }
-  retval = OK;
-
-theend:
-  p_ws = save_p_ws;
-  return retval;
-}
-
-/// @param include  true == include white space
-/// @param type     'p' for paragraph, 'S' for section
-int current_par(oparg_T *oap, long count, int include, int type)
-{
-  linenr_T start_lnum;
-  linenr_T end_lnum;
-  int white_in_front;
-  int dir;
-  int start_is_white;
-  int prev_start_is_white;
-  int retval = OK;
-  int do_white = false;
-  int t;
-  int i;
-
-  if (type == 'S') {        // not implemented yet
-    return FAIL;
-  }
-
-  start_lnum = curwin->w_cursor.lnum;
-
-  /*
-   * When visual area is more than one line: extend it.
-   */
-  if (VIsual_active && start_lnum != VIsual.lnum) {
-extend:
-    if (start_lnum < VIsual.lnum) {
-      dir = BACKWARD;
-    } else {
-      dir = FORWARD;
-    }
-    for (i = (int)count; --i >= 0;) {
-      if (start_lnum ==
-          (dir == BACKWARD ? 1 : curbuf->b_ml.ml_line_count)) {
-        retval = FAIL;
-        break;
-      }
-
-      prev_start_is_white = -1;
-      for (t = 0; t < 2; t++) {
-        start_lnum += dir;
-        start_is_white = linewhite(start_lnum);
-        if (prev_start_is_white == start_is_white) {
-          start_lnum -= dir;
-          break;
-        }
-        for (;;) {
-          if (start_lnum == (dir == BACKWARD
-                             ? 1 : curbuf->b_ml.ml_line_count)) {
-            break;
-          }
-          if (start_is_white != linewhite(start_lnum + dir)
-              || (!start_is_white
-                  && startPS(start_lnum + (dir > 0
-                                           ? 1 : 0), 0, 0))) {
-            break;
-          }
-          start_lnum += dir;
-        }
-        if (!include) {
-          break;
-        }
-        if (start_lnum == (dir == BACKWARD
-                           ? 1 : curbuf->b_ml.ml_line_count)) {
-          break;
-        }
-        prev_start_is_white = start_is_white;
-      }
-    }
-    curwin->w_cursor.lnum = start_lnum;
-    curwin->w_cursor.col = 0;
-    return retval;
-  }
-
-  /*
-   * First move back to the start_lnum of the paragraph or white lines
-   */
-  white_in_front = linewhite(start_lnum);
-  while (start_lnum > 1) {
-    if (white_in_front) {           // stop at first white line
-      if (!linewhite(start_lnum - 1)) {
-        break;
-      }
-    } else {          // stop at first non-white line of start of paragraph
-      if (linewhite(start_lnum - 1) || startPS(start_lnum, 0, 0)) {
-        break;
-      }
-    }
-    start_lnum--;
-  }
-
-  /*
-   * Move past the end of any white lines.
-   */
-  end_lnum = start_lnum;
-  while (end_lnum <= curbuf->b_ml.ml_line_count && linewhite(end_lnum)) {
-    end_lnum++;
-  }
-
-  end_lnum--;
-  i = (int)count;
-  if (!include && white_in_front) {
-    i--;
-  }
-  while (i--) {
-    if (end_lnum == curbuf->b_ml.ml_line_count) {
-      return FAIL;
-    }
-
-    if (!include) {
-      do_white = linewhite(end_lnum + 1);
-    }
-
-    if (include || !do_white) {
-      end_lnum++;
-      // skip to end of paragraph
-      while (end_lnum < curbuf->b_ml.ml_line_count
-             && !linewhite(end_lnum + 1)
-             && !startPS(end_lnum + 1, 0, 0)) {
-        end_lnum++;
-      }
-    }
-
-    if (i == 0 && white_in_front && include) {
-      break;
-    }
-
-    /*
-     * skip to end of white lines after paragraph
-     */
-    if (include || do_white) {
-      while (end_lnum < curbuf->b_ml.ml_line_count
-             && linewhite(end_lnum + 1)) {
-        end_lnum++;
-      }
-    }
-  }
-
-  /*
-   * If there are no empty lines at the end, try to find some empty lines at
-   * the start (unless that has been done already).
-   */
-  if (!white_in_front && !linewhite(end_lnum) && include) {
-    while (start_lnum > 1 && linewhite(start_lnum - 1)) {
-      start_lnum--;
-    }
-  }
-
-  if (VIsual_active) {
-    // Problem: when doing "Vipipip" nothing happens in a single white
-    // line, we get stuck there.  Trap this here.
-    if (VIsual_mode == 'V' && start_lnum == curwin->w_cursor.lnum) {
-      goto extend;
-    }
-    if (VIsual.lnum != start_lnum) {
-      VIsual.lnum = start_lnum;
-      VIsual.col = 0;
-    }
-    VIsual_mode = 'V';
-    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
-    showmode();
-  } else {
-    oap->start.lnum = start_lnum;
-    oap->start.col = 0;
-    oap->motion_type = kMTLineWise;
-  }
-  curwin->w_cursor.lnum = end_lnum;
-  curwin->w_cursor.col = 0;
-
-  return OK;
-}
-
-/// Search quote char from string line[col].
-/// Quote character escaped by one of the characters in "escape" is not counted
-/// as a quote.
-///
-/// @param escape  escape characters, can be NULL
-///
-/// @return        column number of "quotechar" or -1 when not found.
-static int find_next_quote(char_u *line, int col, int quotechar, char_u *escape)
-{
-  int c;
-
-  for (;;) {
-    c = line[col];
-    if (c == NUL) {
-      return -1;
-    } else if (escape != NULL && vim_strchr((char *)escape, c)) {
-      col++;
-      if (line[col] == NUL) {
-        return -1;
-      }
-    } else if (c == quotechar) {
-      break;
-    }
-    col += utfc_ptr2len((char *)line + col);
-  }
-  return col;
-}
-
-/// Search backwards in "line" from column "col_start" to find "quotechar".
-/// Quote character escaped by one of the characters in "escape" is not counted
-/// as a quote.
-///
-/// @param escape  escape characters, can be NULL
-///
-/// @return        the found column or zero.
-static int find_prev_quote(char_u *line, int col_start, int quotechar, char_u *escape)
-{
-  int n;
-
-  while (col_start > 0) {
-    col_start--;
-    col_start -= utf_head_off(line, line + col_start);
-    n = 0;
-    if (escape != NULL) {
-      while (col_start - n > 0 && vim_strchr((char *)escape,
-                                             line[col_start - n - 1]) != NULL) {
-        n++;
-      }
-    }
-    if (n & 1) {
-      col_start -= n;           // uneven number of escape chars, skip it
-    } else if (line[col_start] == quotechar) {
-      break;
-    }
-  }
-  return col_start;
-}
-
-/// Find quote under the cursor, cursor at end.
-///
-/// @param include    true == include quote char
-/// @param quotechar  Quote character
-///
-/// @return           true if found, else false.
-bool current_quote(oparg_T *oap, long count, bool include, int quotechar)
-  FUNC_ATTR_NONNULL_ALL
-{
-  char_u *line = get_cursor_line_ptr();
-  int col_end;
-  int col_start = curwin->w_cursor.col;
-  bool inclusive = false;
-  bool vis_empty = true;                // Visual selection <= 1 char
-  bool vis_bef_curs = false;            // Visual starts before cursor
-  bool did_exclusive_adj = false;       // adjusted pos for 'selection'
-  bool inside_quotes = false;           // Looks like "i'" done before
-  bool selected_quote = false;          // Has quote inside selection
-  int i;
-  bool restore_vis_bef = false;         // resotre VIsual on abort
-
-  // When 'selection' is "exclusive" move the cursor to where it would be
-  // with 'selection' "inclusive", so that the logic is the same for both.
-  // The cursor then is moved forward after adjusting the area.
-  if (VIsual_active) {
-    // this only works within one line
-    if (VIsual.lnum != curwin->w_cursor.lnum) {
-      return false;
-    }
-
-    vis_bef_curs = lt(VIsual, curwin->w_cursor);
-    vis_empty = equalpos(VIsual, curwin->w_cursor);
-    if (*p_sel == 'e') {
-      if (vis_bef_curs) {
-        dec_cursor();
-        did_exclusive_adj = true;
-      } else if (!vis_empty) {
-        dec(&VIsual);
-        did_exclusive_adj = true;
-      }
-      vis_empty = equalpos(VIsual, curwin->w_cursor);
-      if (!vis_bef_curs && !vis_empty) {
-        // VIsual needs to be start of Visual selection.
-        pos_T t = curwin->w_cursor;
-
-        curwin->w_cursor = VIsual;
-        VIsual = t;
-        vis_bef_curs = true;
-        restore_vis_bef = true;
-      }
-    }
-  }
-
-  if (!vis_empty) {
-    // Check if the existing selection exactly spans the text inside
-    // quotes.
-    if (vis_bef_curs) {
-      inside_quotes = VIsual.col > 0
-                      && line[VIsual.col - 1] == quotechar
-                      && line[curwin->w_cursor.col] != NUL
-                      && line[curwin->w_cursor.col + 1] == quotechar;
-      i = VIsual.col;
-      col_end = curwin->w_cursor.col;
-    } else {
-      inside_quotes = curwin->w_cursor.col > 0
-                      && line[curwin->w_cursor.col - 1] == quotechar
-                      && line[VIsual.col] != NUL
-                      && line[VIsual.col + 1] == quotechar;
-      i = curwin->w_cursor.col;
-      col_end = VIsual.col;
-    }
-
-    // Find out if we have a quote in the selection.
-    while (i <= col_end) {
-      // check for going over the end of the line, which can happen if
-      // the line was changed after the Visual area was selected.
-      if (line[i] == NUL) {
-        break;
-      }
-      if (line[i++] == quotechar) {
-        selected_quote = true;
-        break;
-      }
-    }
-  }
-
-  if (!vis_empty && line[col_start] == quotechar) {
-    // Already selecting something and on a quote character.  Find the
-    // next quoted string.
-    if (vis_bef_curs) {
-      // Assume we are on a closing quote: move to after the next
-      // opening quote.
-      col_start = find_next_quote(line, col_start + 1, quotechar, NULL);
-      if (col_start < 0) {
-        goto abort_search;
-      }
-      col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
-      if (col_end < 0) {
-        // We were on a starting quote perhaps?
-        col_end = col_start;
-        col_start = curwin->w_cursor.col;
-      }
-    } else {
-      col_end = find_prev_quote(line, col_start, quotechar, NULL);
-      if (line[col_end] != quotechar) {
-        goto abort_search;
-      }
-      col_start = find_prev_quote(line, col_end, quotechar, (char_u *)curbuf->b_p_qe);
-      if (line[col_start] != quotechar) {
-        // We were on an ending quote perhaps?
-        col_start = col_end;
-        col_end = curwin->w_cursor.col;
-      }
-    }
-  } else if (line[col_start] == quotechar || !vis_empty) {
-    int first_col = col_start;
-
-    if (!vis_empty) {
-      if (vis_bef_curs) {
-        first_col = find_next_quote(line, col_start, quotechar, NULL);
-      } else {
-        first_col = find_prev_quote(line, col_start, quotechar, NULL);
-      }
-    }
-    // The cursor is on a quote, we don't know if it's the opening or
-    // closing quote.  Search from the start of the line to find out.
-    // Also do this when there is a Visual area, a' may leave the cursor
-    // in between two strings.
-    col_start = 0;
-    for (;;) {
-      // Find open quote character.
-      col_start = find_next_quote(line, col_start, quotechar, NULL);
-      if (col_start < 0 || col_start > first_col) {
-        goto abort_search;
-      }
-      // Find close quote character.
-      col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
-      if (col_end < 0) {
-        goto abort_search;
-      }
-      // If is cursor between start and end quote character, it is
-      // target text object.
-      if (col_start <= first_col && first_col <= col_end) {
-        break;
-      }
-      col_start = col_end + 1;
-    }
-  } else {
-    // Search backward for a starting quote.
-    col_start = find_prev_quote(line, col_start, quotechar, (char_u *)curbuf->b_p_qe);
-    if (line[col_start] != quotechar) {
-      // No quote before the cursor, look after the cursor.
-      col_start = find_next_quote(line, col_start, quotechar, NULL);
-      if (col_start < 0) {
-        goto abort_search;
-      }
-    }
-
-    // Find close quote character.
-    col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
-    if (col_end < 0) {
-      goto abort_search;
-    }
-  }
-
-  // When "include" is true, include spaces after closing quote or before
-  // the starting quote.
-  if (include) {
-    if (ascii_iswhite(line[col_end + 1])) {
-      while (ascii_iswhite(line[col_end + 1])) {
-        col_end++;
-      }
-    } else {
-      while (col_start > 0 && ascii_iswhite(line[col_start - 1])) {
-        col_start--;
-      }
-    }
-  }
-
-  // Set start position.  After vi" another i" must include the ".
-  // For v2i" include the quotes.
-  if (!include && count < 2 && (vis_empty || !inside_quotes)) {
-    col_start++;
-  }
-  curwin->w_cursor.col = col_start;
-  if (VIsual_active) {
-    // Set the start of the Visual area when the Visual area was empty, we
-    // were just inside quotes or the Visual area didn't start at a quote
-    // and didn't include a quote.
-    if (vis_empty
-        || (vis_bef_curs
-            && !selected_quote
-            && (inside_quotes
-                || (line[VIsual.col] != quotechar
-                    && (VIsual.col == 0
-                        || line[VIsual.col - 1] != quotechar))))) {
-      VIsual = curwin->w_cursor;
-      redraw_curbuf_later(UPD_INVERTED);
-    }
-  } else {
-    oap->start = curwin->w_cursor;
-    oap->motion_type = kMTCharWise;
-  }
-
-  // Set end position.
-  curwin->w_cursor.col = col_end;
-  if ((include || count > 1
-       // After vi" another i" must include the ".
-       || (!vis_empty && inside_quotes)
-       ) && inc_cursor() == 2) {
-    inclusive = true;
-  }
-  if (VIsual_active) {
-    if (vis_empty || vis_bef_curs) {
-      // decrement cursor when 'selection' is not exclusive
-      if (*p_sel != 'e') {
-        dec_cursor();
-      }
-    } else {
-      // Cursor is at start of Visual area.  Set the end of the Visual
-      // area when it was just inside quotes or it didn't end at a
-      // quote.
-      if (inside_quotes
-          || (!selected_quote
-              && line[VIsual.col] != quotechar
-              && (line[VIsual.col] == NUL
-                  || line[VIsual.col + 1] != quotechar))) {
-        dec_cursor();
-        VIsual = curwin->w_cursor;
-      }
-      curwin->w_cursor.col = col_start;
-    }
-    if (VIsual_mode == 'V') {
-      VIsual_mode = 'v';
-      redraw_cmdline = true;                    // show mode later
-    }
-  } else {
-    // Set inclusive and other oap's flags.
-    oap->inclusive = inclusive;
-  }
-
-  return true;
-
-abort_search:
-  if (VIsual_active && *p_sel == 'e') {
-    if (did_exclusive_adj) {
-      inc_cursor();
-    }
-    if (restore_vis_bef) {
-      pos_T t = curwin->w_cursor;
-
-      curwin->w_cursor = VIsual;
-      VIsual = t;
-    }
-  }
-  return false;
-}
-
 /// Find next search match under cursor, cursor at end.
 /// Used while an operator is pending, and in Visual mode.
 ///
diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c
index 43afc08155..b2bfca08ed 100644
--- a/src/nvim/textformat.c
+++ b/src/nvim/textformat.c
@@ -5,6 +5,7 @@
 
 #include <stdbool.h>
 
+#include "nvim/ascii.h"
 #include "nvim/change.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
@@ -15,14 +16,18 @@
 #include "nvim/globals.h"
 #include "nvim/indent.h"
 #include "nvim/indent_c.h"
+#include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/move.h"
+#include "nvim/normal.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
+#include "nvim/pos.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/textformat.h"
+#include "nvim/textobject.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
diff --git a/src/nvim/textformat.h b/src/nvim/textformat.h
index 9d8327e6eb..3c918a028b 100644
--- a/src/nvim/textformat.h
+++ b/src/nvim/textformat.h
@@ -1,8 +1,6 @@
 #ifndef NVIM_TEXTFORMAT_H
 #define NVIM_TEXTFORMAT_H
 
-#include <stdbool.h>
-
 #include "nvim/normal.h"  // for oparg_T
 #include "nvim/pos.h"  // for linenr_T
 
diff --git a/src/nvim/textobject.c b/src/nvim/textobject.c
new file mode 100644
index 0000000000..02174edeb1
--- /dev/null
+++ b/src/nvim/textobject.c
@@ -0,0 +1,1742 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
+// textobject.c: functions for text objects
+
+#include <stdbool.h>
+
+#include "nvim/ascii.h"
+#include "nvim/cursor.h"
+#include "nvim/drawscreen.h"
+#include "nvim/edit.h"
+#include "nvim/eval/funcs.h"
+#include "nvim/fold.h"
+#include "nvim/globals.h"
+#include "nvim/indent.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/normal.h"
+#include "nvim/pos.h"
+#include "nvim/search.h"
+#include "nvim/textformat.h"
+#include "nvim/textobject.h"
+#include "nvim/vim.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "textobject.c.generated.h"
+#endif
+
+/// Find the start of the next sentence, searching in the direction specified
+/// by the "dir" argument.  The cursor is positioned on the start of the next
+/// sentence when found.  If the next sentence is found, return OK.  Return FAIL
+/// otherwise.  See ":h sentence" for the precise definition of a "sentence"
+/// text object.
+int findsent(Direction dir, long count)
+{
+  pos_T pos, tpos;
+  int c;
+  int (*func)(pos_T *);
+  bool noskip = false;              // do not skip blanks
+
+  pos = curwin->w_cursor;
+  if (dir == FORWARD) {
+    func = incl;
+  } else {
+    func = decl;
+  }
+
+  while (count--) {
+    const pos_T prev_pos = pos;
+
+    // if on an empty line, skip up to a non-empty line
+    if (gchar_pos(&pos) == NUL) {
+      do {
+        if ((*func)(&pos) == -1) {
+          break;
+        }
+      } while (gchar_pos(&pos) == NUL);
+      if (dir == FORWARD) {
+        goto found;
+      }
+      // if on the start of a paragraph or a section and searching forward,
+      // go to the next line
+    } else if (dir == FORWARD && pos.col == 0
+               && startPS(pos.lnum, NUL, false)) {
+      if (pos.lnum == curbuf->b_ml.ml_line_count) {
+        return FAIL;
+      }
+      pos.lnum++;
+      goto found;
+    } else if (dir == BACKWARD) {
+      decl(&pos);
+    }
+
+    // go back to the previous non-white non-punctuation character
+    bool found_dot = false;
+    while (c = gchar_pos(&pos), ascii_iswhite(c)
+           || vim_strchr(".!?)]\"'", c) != NULL) {
+      tpos = pos;
+      if (decl(&tpos) == -1 || (LINEEMPTY(tpos.lnum) && dir == FORWARD)) {
+        break;
+      }
+      if (found_dot) {
+        break;
+      }
+      if (vim_strchr(".!?", c) != NULL) {
+        found_dot = true;
+      }
+      if (vim_strchr(")]\"'", c) != NULL
+          && vim_strchr(".!?)]\"'", gchar_pos(&tpos)) == NULL) {
+        break;
+      }
+      decl(&pos);
+    }
+
+    // remember the line where the search started
+    const int startlnum = pos.lnum;
+    const bool cpo_J = vim_strchr(p_cpo, CPO_ENDOFSENT) != NULL;
+
+    for (;;) {                 // find end of sentence
+      c = gchar_pos(&pos);
+      if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, false))) {
+        if (dir == BACKWARD && pos.lnum != startlnum) {
+          pos.lnum++;
+        }
+        break;
+      }
+      if (c == '.' || c == '!' || c == '?') {
+        tpos = pos;
+        do {
+          if ((c = inc(&tpos)) == -1) {
+            break;
+          }
+        } while (vim_strchr(")]\"'", c = gchar_pos(&tpos))
+                 != NULL);
+        if (c == -1 || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL
+            || (cpo_J && (c == ' ' && inc(&tpos) >= 0
+                          && gchar_pos(&tpos) == ' '))) {
+          pos = tpos;
+          if (gchar_pos(&pos) == NUL) {         // skip NUL at EOL
+            inc(&pos);
+          }
+          break;
+        }
+      }
+      if ((*func)(&pos) == -1) {
+        if (count) {
+          return FAIL;
+        }
+        noskip = true;
+        break;
+      }
+    }
+found:
+    // skip white space
+    while (!noskip && ((c = gchar_pos(&pos)) == ' ' || c == '\t')) {
+      if (incl(&pos) == -1) {
+        break;
+      }
+    }
+
+    if (equalpos(prev_pos, pos)) {
+      // didn't actually move, advance one character and try again
+      if ((*func)(&pos) == -1) {
+        if (count) {
+          return FAIL;
+        }
+        break;
+      }
+      count++;
+    }
+  }
+
+  setpcmark();
+  curwin->w_cursor = pos;
+  return OK;
+}
+
+/// Find the next paragraph or section in direction 'dir'.
+/// Paragraphs are currently supposed to be separated by empty lines.
+/// If 'what' is NUL we go to the next paragraph.
+/// If 'what' is '{' or '}' we go to the next section.
+/// If 'both' is true also stop at '}'.
+///
+/// @param pincl  Return: true if last char is to be included
+///
+/// @return       true if the next paragraph or section was found.
+bool findpar(bool *pincl, int dir, long count, int what, bool both)
+{
+  linenr_T curr;
+  bool did_skip;            // true after separating lines have been skipped
+  bool first;               // true on first line
+  linenr_T fold_first;      // first line of a closed fold
+  linenr_T fold_last;       // last line of a closed fold
+  bool fold_skipped;        // true if a closed fold was skipped this
+                            // iteration
+
+  curr = curwin->w_cursor.lnum;
+
+  while (count--) {
+    did_skip = false;
+    for (first = true;; first = false) {
+      if (*ml_get(curr) != NUL) {
+        did_skip = true;
+      }
+
+      // skip folded lines
+      fold_skipped = false;
+      if (first && hasFolding(curr, &fold_first, &fold_last)) {
+        curr = ((dir > 0) ? fold_last : fold_first) + dir;
+        fold_skipped = true;
+      }
+
+      if (!first && did_skip && startPS(curr, what, both)) {
+        break;
+      }
+
+      if (fold_skipped) {
+        curr -= dir;
+      }
+      if ((curr += dir) < 1 || curr > curbuf->b_ml.ml_line_count) {
+        if (count) {
+          return false;
+        }
+        curr -= dir;
+        break;
+      }
+    }
+  }
+  setpcmark();
+  if (both && *ml_get(curr) == '}') {   // include line with '}'
+    curr++;
+  }
+  curwin->w_cursor.lnum = curr;
+  if (curr == curbuf->b_ml.ml_line_count && what != '}') {
+    char_u *line = ml_get(curr);
+
+    // Put the cursor on the last character in the last line and make the
+    // motion inclusive.
+    if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0) {
+      curwin->w_cursor.col--;
+      curwin->w_cursor.col -= utf_head_off(line, line + curwin->w_cursor.col);
+      *pincl = true;
+    }
+  } else {
+    curwin->w_cursor.col = 0;
+  }
+  return true;
+}
+
+/// check if the string 's' is a nroff macro that is in option 'opt'
+static bool inmacro(char_u *opt, char_u *s)
+{
+  char_u *macro;
+
+  for (macro = opt; macro[0]; macro++) {
+    // Accept two characters in the option being equal to two characters
+    // in the line.  A space in the option matches with a space in the
+    // line or the line having ended.
+    if ((macro[0] == s[0]
+         || (macro[0] == ' '
+             && (s[0] == NUL || s[0] == ' ')))
+        && (macro[1] == s[1]
+            || ((macro[1] == NUL || macro[1] == ' ')
+                && (s[0] == NUL || s[1] == NUL || s[1] == ' ')))) {
+      break;
+    }
+    macro++;
+    if (macro[0] == NUL) {
+      break;
+    }
+  }
+  return macro[0] != NUL;
+}
+
+/// startPS: return true if line 'lnum' is the start of a section or paragraph.
+/// If 'para' is '{' or '}' only check for sections.
+/// If 'both' is true also stop at '}'
+bool startPS(linenr_T lnum, int para, bool both)
+{
+  char_u *s;
+
+  s = ml_get(lnum);
+  if (*s == para || *s == '\f' || (both && *s == '}')) {
+    return true;
+  }
+  if (*s == '.' && (inmacro((char_u *)p_sections, s + 1)
+                    || (!para && inmacro(p_para, s + 1)))) {
+    return true;
+  }
+  return false;
+}
+
+// The following routines do the word searches performed by the 'w', 'W',
+// 'b', 'B', 'e', and 'E' commands.
+
+// To perform these searches, characters are placed into one of three
+// classes, and transitions between classes determine word boundaries.
+//
+// The classes are:
+//
+// 0 - white space
+// 1 - punctuation
+// 2 or higher - keyword characters (letters, digits and underscore)
+
+static bool cls_bigword;  ///< true for "W", "B" or "E"
+
+/// cls() - returns the class of character at curwin->w_cursor
+///
+/// If a 'W', 'B', or 'E' motion is being done (cls_bigword == true), chars
+/// from class 2 and higher are reported as class 1 since only white space
+/// boundaries are of interest.
+static int cls(void)
+{
+  int c;
+
+  c = gchar_cursor();
+  if (c == ' ' || c == '\t' || c == NUL) {
+    return 0;
+  }
+
+  c = utf_class(c);
+
+  // If cls_bigword is true, report all non-blanks as class 1.
+  if (c != 0 && cls_bigword) {
+    return 1;
+  }
+  return c;
+}
+
+/// fwd_word(count, type, eol) - move forward one word
+///
+/// @return  FAIL if the cursor was already at the end of the file.
+/// If eol is true, last word stops at end of line (for operators).
+///
+/// @param bigword  "W", "E" or "B"
+int fwd_word(long count, bool bigword, bool eol)
+{
+  int sclass;               // starting class
+  int i;
+  int last_line;
+
+  curwin->w_cursor.coladd = 0;
+  cls_bigword = bigword;
+  while (--count >= 0) {
+    // When inside a range of folded lines, move to the last char of the
+    // last line.
+    if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) {
+      coladvance(MAXCOL);
+    }
+    sclass = cls();
+
+    // We always move at least one character, unless on the last
+    // character in the buffer.
+    last_line = (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count);
+    i = inc_cursor();
+    if (i == -1 || (i >= 1 && last_line)) {   // started at last char in file
+      return FAIL;
+    }
+    if (i >= 1 && eol && count == 0) {        // started at last char in line
+      return OK;
+    }
+
+    // Go one char past end of current word (if any)
+    if (sclass != 0) {
+      while (cls() == sclass) {
+        i = inc_cursor();
+        if (i == -1 || (i >= 1 && eol && count == 0)) {
+          return OK;
+        }
+      }
+    }
+
+    // go to next non-white
+    while (cls() == 0) {
+      // We'll stop if we land on a blank line
+      if (curwin->w_cursor.col == 0 && *get_cursor_line_ptr() == NUL) {
+        break;
+      }
+
+      i = inc_cursor();
+      if (i == -1 || (i >= 1 && eol && count == 0)) {
+        return OK;
+      }
+    }
+  }
+  return OK;
+}
+
+/// bck_word() - move backward 'count' words
+///
+/// If stop is true and we are already on the start of a word, move one less.
+///
+/// Returns FAIL if top of the file was reached.
+int bck_word(long count, bool bigword, bool stop)
+{
+  int sclass;               // starting class
+
+  curwin->w_cursor.coladd = 0;
+  cls_bigword = bigword;
+  while (--count >= 0) {
+    // When inside a range of folded lines, move to the first char of the
+    // first line.
+    if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL)) {
+      curwin->w_cursor.col = 0;
+    }
+    sclass = cls();
+    if (dec_cursor() == -1) {           // started at start of file
+      return FAIL;
+    }
+
+    if (!stop || sclass == cls() || sclass == 0) {
+      // Skip white space before the word.
+      // Stop on an empty line.
+      while (cls() == 0) {
+        if (curwin->w_cursor.col == 0
+            && LINEEMPTY(curwin->w_cursor.lnum)) {
+          goto finished;
+        }
+        if (dec_cursor() == -1) {       // hit start of file, stop here
+          return OK;
+        }
+      }
+
+      // Move backward to start of this word.
+      if (skip_chars(cls(), BACKWARD)) {
+        return OK;
+      }
+    }
+
+    inc_cursor();                       // overshot - forward one
+finished:
+    stop = false;
+  }
+  return OK;
+}
+
+/// end_word() - move to the end of the word
+///
+/// There is an apparent bug in the 'e' motion of the real vi. At least on the
+/// System V Release 3 version for the 80386. Unlike 'b' and 'w', the 'e'
+/// motion crosses blank lines. When the real vi crosses a blank line in an
+/// 'e' motion, the cursor is placed on the FIRST character of the next
+/// non-blank line. The 'E' command, however, works correctly. Since this
+/// appears to be a bug, I have not duplicated it here.
+///
+/// Returns FAIL if end of the file was reached.
+///
+/// If stop is true and we are already on the end of a word, move one less.
+/// If empty is true stop on an empty line.
+int end_word(long count, bool bigword, bool stop, bool empty)
+{
+  int sclass;               // starting class
+
+  curwin->w_cursor.coladd = 0;
+  cls_bigword = bigword;
+  while (--count >= 0) {
+    // When inside a range of folded lines, move to the last char of the
+    // last line.
+    if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) {
+      coladvance(MAXCOL);
+    }
+    sclass = cls();
+    if (inc_cursor() == -1) {
+      return FAIL;
+    }
+
+    // If we're in the middle of a word, we just have to move to the end
+    // of it.
+    if (cls() == sclass && sclass != 0) {
+      // Move forward to end of the current word
+      if (skip_chars(sclass, FORWARD)) {
+        return FAIL;
+      }
+    } else if (!stop || sclass == 0) {
+      // We were at the end of a word. Go to the end of the next word.
+      // First skip white space, if 'empty' is true, stop at empty line.
+      while (cls() == 0) {
+        if (empty && curwin->w_cursor.col == 0
+            && LINEEMPTY(curwin->w_cursor.lnum)) {
+          goto finished;
+        }
+        if (inc_cursor() == -1) {           // hit end of file, stop here
+          return FAIL;
+        }
+      }
+
+      // Move forward to the end of this word.
+      if (skip_chars(cls(), FORWARD)) {
+        return FAIL;
+      }
+    }
+    dec_cursor();                       // overshot - one char backward
+finished:
+    stop = false;                       // we move only one word less
+  }
+  return OK;
+}
+
+/// Move back to the end of the word.
+///
+/// @param bigword  true for "B"
+/// @param eol      if true, then stop at end of line.
+///
+/// @return         FAIL if start of the file was reached.
+int bckend_word(long count, bool bigword, bool eol)
+{
+  int sclass;               // starting class
+  int i;
+
+  curwin->w_cursor.coladd = 0;
+  cls_bigword = bigword;
+  while (--count >= 0) {
+    sclass = cls();
+    if ((i = dec_cursor()) == -1) {
+      return FAIL;
+    }
+    if (eol && i == 1) {
+      return OK;
+    }
+
+    // Move backward to before the start of this word.
+    if (sclass != 0) {
+      while (cls() == sclass) {
+        if ((i = dec_cursor()) == -1 || (eol && i == 1)) {
+          return OK;
+        }
+      }
+    }
+
+    // Move backward to end of the previous word
+    while (cls() == 0) {
+      if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum)) {
+        break;
+      }
+      if ((i = dec_cursor()) == -1 || (eol && i == 1)) {
+        return OK;
+      }
+    }
+  }
+  return OK;
+}
+
+/// Skip a row of characters of the same class.
+///
+/// @return  true when end-of-file reached, false otherwise.
+static bool skip_chars(int cclass, int dir)
+{
+  while (cls() == cclass) {
+    if ((dir == FORWARD ? inc_cursor() : dec_cursor()) == -1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/// Go back to the start of the word or the start of white space
+static void back_in_line(void)
+{
+  int sclass;                       // starting class
+
+  sclass = cls();
+  for (;;) {
+    if (curwin->w_cursor.col == 0) {        // stop at start of line
+      break;
+    }
+    dec_cursor();
+    if (cls() != sclass) {                  // stop at start of word
+      inc_cursor();
+      break;
+    }
+  }
+}
+
+static void find_first_blank(pos_T *posp)
+{
+  int c;
+
+  while (decl(posp) != -1) {
+    c = gchar_pos(posp);
+    if (!ascii_iswhite(c)) {
+      incl(posp);
+      break;
+    }
+  }
+}
+
+/// Skip count/2 sentences and count/2 separating white spaces.
+///
+/// @param at_start_sent  cursor is at start of sentence
+static void findsent_forward(long count, bool at_start_sent)
+{
+  while (count--) {
+    findsent(FORWARD, 1L);
+    if (at_start_sent) {
+      find_first_blank(&curwin->w_cursor);
+    }
+    if (count == 0 || at_start_sent) {
+      decl(&curwin->w_cursor);
+    }
+    at_start_sent = !at_start_sent;
+  }
+}
+
+/// Find word under cursor, cursor at end.
+/// Used while an operator is pending, and in Visual mode.
+///
+/// @param include  true: include word and white space
+/// @param bigword  false == word, true == WORD
+int current_word(oparg_T *oap, long count, bool include, bool bigword)
+{
+  pos_T start_pos;
+  pos_T pos;
+  bool inclusive = true;
+  int include_white = false;
+
+  cls_bigword = bigword;
+  clearpos(&start_pos);
+
+  // Correct cursor when 'selection' is exclusive
+  if (VIsual_active && *p_sel == 'e' && lt(VIsual, curwin->w_cursor)) {
+    dec_cursor();
+  }
+
+  // When Visual mode is not active, or when the VIsual area is only one
+  // character, select the word and/or white space under the cursor.
+  if (!VIsual_active || equalpos(curwin->w_cursor, VIsual)) {
+    // Go to start of current word or white space.
+    back_in_line();
+    start_pos = curwin->w_cursor;
+
+    // If the start is on white space, and white space should be included
+    // (" word"), or start is not on white space, and white space should
+    // not be included ("word"), find end of word.
+    if ((cls() == 0) == include) {
+      if (end_word(1L, bigword, true, true) == FAIL) {
+        return FAIL;
+      }
+    } else {
+      // If the start is not on white space, and white space should be
+      // included ("word   "), or start is on white space and white
+      // space should not be included ("   "), find start of word.
+      // If we end up in the first column of the next line (single char
+      // word) back up to end of the line.
+      fwd_word(1L, bigword, true);
+      if (curwin->w_cursor.col == 0) {
+        decl(&curwin->w_cursor);
+      } else {
+        oneleft();
+      }
+
+      if (include) {
+        include_white = true;
+      }
+    }
+
+    if (VIsual_active) {
+      // should do something when inclusive == false !
+      VIsual = start_pos;
+      redraw_curbuf_later(UPD_INVERTED);  // update the inversion
+    } else {
+      oap->start = start_pos;
+      oap->motion_type = kMTCharWise;
+    }
+    count--;
+  }
+
+  // When count is still > 0, extend with more objects.
+  while (count > 0) {
+    inclusive = true;
+    if (VIsual_active && lt(curwin->w_cursor, VIsual)) {
+      // In Visual mode, with cursor at start: move cursor back.
+      if (decl(&curwin->w_cursor) == -1) {
+        return FAIL;
+      }
+      if (include != (cls() != 0)) {
+        if (bck_word(1L, bigword, true) == FAIL) {
+          return FAIL;
+        }
+      } else {
+        if (bckend_word(1L, bigword, true) == FAIL) {
+          return FAIL;
+        }
+        (void)incl(&curwin->w_cursor);
+      }
+    } else {
+      // Move cursor forward one word and/or white area.
+      if (incl(&curwin->w_cursor) == -1) {
+        return FAIL;
+      }
+      if (include != (cls() == 0)) {
+        if (fwd_word(1L, bigword, true) == FAIL && count > 1) {
+          return FAIL;
+        }
+        // If end is just past a new-line, we don't want to include
+        // the first character on the line.
+        // Put cursor on last char of white.
+        if (oneleft() == FAIL) {
+          inclusive = false;
+        }
+      } else {
+        if (end_word(1L, bigword, true, true) == FAIL) {
+          return FAIL;
+        }
+      }
+    }
+    count--;
+  }
+
+  if (include_white && (cls() != 0
+                        || (curwin->w_cursor.col == 0 && !inclusive))) {
+    // If we don't include white space at the end, move the start
+    // to include some white space there. This makes "daw" work
+    // better on the last word in a sentence (and "2daw" on last-but-one
+    // word).  Also when "2daw" deletes "word." at the end of the line
+    // (cursor is at start of next line).
+    // But don't delete white space at start of line (indent).
+    pos = curwin->w_cursor;     // save cursor position
+    curwin->w_cursor = start_pos;
+    if (oneleft() == OK) {
+      back_in_line();
+      if (cls() == 0 && curwin->w_cursor.col > 0) {
+        if (VIsual_active) {
+          VIsual = curwin->w_cursor;
+        } else {
+          oap->start = curwin->w_cursor;
+        }
+      }
+    }
+    curwin->w_cursor = pos;     // put cursor back at end
+  }
+
+  if (VIsual_active) {
+    if (*p_sel == 'e' && inclusive && ltoreq(VIsual, curwin->w_cursor)) {
+      inc_cursor();
+    }
+    if (VIsual_mode == 'V') {
+      VIsual_mode = 'v';
+      redraw_cmdline = true;                    // show mode later
+    }
+  } else {
+    oap->inclusive = inclusive;
+  }
+
+  return OK;
+}
+
+/// Find sentence(s) under the cursor, cursor at end.
+/// When Visual active, extend it by one or more sentences.
+int current_sent(oparg_T *oap, long count, bool include)
+{
+  pos_T start_pos;
+  pos_T pos;
+  bool start_blank;
+  int c;
+  bool at_start_sent;
+  long ncount;
+
+  start_pos = curwin->w_cursor;
+  pos = start_pos;
+  findsent(FORWARD, 1L);        // Find start of next sentence.
+
+  // When the Visual area is bigger than one character: Extend it.
+  if (VIsual_active && !equalpos(start_pos, VIsual)) {
+extend:
+    if (lt(start_pos, VIsual)) {
+      // Cursor at start of Visual area.
+      // Find out where we are:
+      // - in the white space before a sentence
+      // - in a sentence or just after it
+      // - at the start of a sentence
+      at_start_sent = true;
+      decl(&pos);
+      while (lt(pos, curwin->w_cursor)) {
+        c = gchar_pos(&pos);
+        if (!ascii_iswhite(c)) {
+          at_start_sent = false;
+          break;
+        }
+        incl(&pos);
+      }
+      if (!at_start_sent) {
+        findsent(BACKWARD, 1L);
+        if (equalpos(curwin->w_cursor, start_pos)) {
+          at_start_sent = true;            // exactly at start of sentence
+        } else {
+          // inside a sentence, go to its end (start of next)
+          findsent(FORWARD, 1L);
+        }
+      }
+      if (include) {            // "as" gets twice as much as "is"
+        count *= 2;
+      }
+      while (count--) {
+        if (at_start_sent) {
+          find_first_blank(&curwin->w_cursor);
+        }
+        c = gchar_cursor();
+        if (!at_start_sent || (!include && !ascii_iswhite(c))) {
+          findsent(BACKWARD, 1L);
+        }
+        at_start_sent = !at_start_sent;
+      }
+    } else {
+      // Cursor at end of Visual area.
+      // Find out where we are:
+      // - just before a sentence
+      // - just before or in the white space before a sentence
+      // - in a sentence
+      incl(&pos);
+      at_start_sent = true;
+      if (!equalpos(pos, curwin->w_cursor)) {     // not just before a sentence
+        at_start_sent = false;
+        while (lt(pos, curwin->w_cursor)) {
+          c = gchar_pos(&pos);
+          if (!ascii_iswhite(c)) {
+            at_start_sent = true;
+            break;
+          }
+          incl(&pos);
+        }
+        if (at_start_sent) {            // in the sentence
+          findsent(BACKWARD, 1L);
+        } else {  // in/before white before a sentence
+          curwin->w_cursor = start_pos;
+        }
+      }
+
+      if (include) {            // "as" gets twice as much as "is"
+        count *= 2;
+      }
+      findsent_forward(count, at_start_sent);
+      if (*p_sel == 'e') {
+        curwin->w_cursor.col++;
+      }
+    }
+    return OK;
+  }
+
+  // If the cursor started on a blank, check if it is just before the start
+  // of the next sentence.
+  while (c = gchar_pos(&pos), ascii_iswhite(c)) {
+    incl(&pos);
+  }
+  if (equalpos(pos, curwin->w_cursor)) {
+    start_blank = true;
+    find_first_blank(&start_pos);       // go back to first blank
+  } else {
+    start_blank = false;
+    findsent(BACKWARD, 1L);
+    start_pos = curwin->w_cursor;
+  }
+  if (include) {
+    ncount = count * 2;
+  } else {
+    ncount = count;
+    if (start_blank) {
+      ncount--;
+    }
+  }
+  if (ncount > 0) {
+    findsent_forward(ncount, true);
+  } else {
+    decl(&curwin->w_cursor);
+  }
+
+  if (include) {
+    // If the blank in front of the sentence is included, exclude the
+    // blanks at the end of the sentence, go back to the first blank.
+    // If there are no trailing blanks, try to include leading blanks.
+    if (start_blank) {
+      find_first_blank(&curwin->w_cursor);
+      c = gchar_pos(&curwin->w_cursor);
+      if (ascii_iswhite(c)) {
+        decl(&curwin->w_cursor);
+      }
+    } else if (c = gchar_cursor(), !ascii_iswhite(c)) {
+      find_first_blank(&start_pos);
+    }
+  }
+
+  if (VIsual_active) {
+    // Avoid getting stuck with "is" on a single space before a sentence.
+    if (equalpos(start_pos, curwin->w_cursor)) {
+      goto extend;
+    }
+    if (*p_sel == 'e') {
+      curwin->w_cursor.col++;
+    }
+    VIsual = start_pos;
+    VIsual_mode = 'v';
+    redraw_cmdline = true;    // show mode later
+    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
+  } else {
+    // include a newline after the sentence, if there is one
+    if (incl(&curwin->w_cursor) == -1) {
+      oap->inclusive = true;
+    } else {
+      oap->inclusive = false;
+    }
+    oap->start = start_pos;
+    oap->motion_type = kMTCharWise;
+  }
+  return OK;
+}
+
+/// Find block under the cursor, cursor at end.
+/// "what" and "other" are two matching parenthesis/brace/etc.
+///
+/// @param include  true == include white space
+/// @param what     '(', '{', etc.
+/// @param other    ')', '}', etc.
+int current_block(oparg_T *oap, long count, bool include, int what, int other)
+{
+  pos_T old_pos;
+  pos_T *pos = NULL;
+  pos_T start_pos;
+  pos_T *end_pos;
+  pos_T old_start, old_end;
+  char *save_cpo;
+  bool sol = false;                      // '{' at start of line
+
+  old_pos = curwin->w_cursor;
+  old_end = curwin->w_cursor;           // remember where we started
+  old_start = old_end;
+
+  // If we start on '(', '{', ')', '}', etc., use the whole block inclusive.
+  if (!VIsual_active || equalpos(VIsual, curwin->w_cursor)) {
+    setpcmark();
+    if (what == '{') {                  // ignore indent
+      while (inindent(1)) {
+        if (inc_cursor() != 0) {
+          break;
+        }
+      }
+    }
+    if (gchar_cursor() == what) {
+      // cursor on '(' or '{', move cursor just after it
+      curwin->w_cursor.col++;
+    }
+  } else if (lt(VIsual, curwin->w_cursor)) {
+    old_start = VIsual;
+    curwin->w_cursor = VIsual;              // cursor at low end of Visual
+  } else {
+    old_end = VIsual;
+  }
+
+  // Search backwards for unclosed '(', '{', etc..
+  // Put this position in start_pos.
+  // Ignore quotes here.  Keep the "M" flag in 'cpo', as that is what the
+  // user wants.
+  save_cpo = p_cpo;
+  p_cpo = vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%";
+  if ((pos = findmatch(NULL, what)) != NULL) {
+    while (count-- > 0) {
+      if ((pos = findmatch(NULL, what)) == NULL) {
+        break;
+      }
+      curwin->w_cursor = *pos;
+      start_pos = *pos;   // the findmatch for end_pos will overwrite *pos
+    }
+  } else {
+    while (count-- > 0) {
+      if ((pos = findmatchlimit(NULL, what, FM_FORWARD, 0)) == NULL) {
+        break;
+      }
+      curwin->w_cursor = *pos;
+      start_pos = *pos;   // the findmatch for end_pos will overwrite *pos
+    }
+  }
+  p_cpo = save_cpo;
+
+  // Search for matching ')', '}', etc.
+  // Put this position in curwin->w_cursor.
+  if (pos == NULL || (end_pos = findmatch(NULL, other)) == NULL) {
+    curwin->w_cursor = old_pos;
+    return FAIL;
+  }
+  curwin->w_cursor = *end_pos;
+
+  // Try to exclude the '(', '{', ')', '}', etc. when "include" is false.
+  // If the ending '}', ')' or ']' is only preceded by indent, skip that
+  // indent. But only if the resulting area is not smaller than what we
+  // started with.
+  while (!include) {
+    incl(&start_pos);
+    sol = (curwin->w_cursor.col == 0);
+    decl(&curwin->w_cursor);
+    while (inindent(1)) {
+      sol = true;
+      if (decl(&curwin->w_cursor) != 0) {
+        break;
+      }
+    }
+
+    // In Visual mode, when the resulting area is not bigger than what we
+    // started with, extend it to the next block, and then exclude again.
+    // Don't try to expand the area if the area is empty.
+    if (!lt(start_pos, old_start) && !lt(old_end, curwin->w_cursor)
+        && !equalpos(start_pos, curwin->w_cursor)
+        && VIsual_active) {
+      curwin->w_cursor = old_start;
+      decl(&curwin->w_cursor);
+      if ((pos = findmatch(NULL, what)) == NULL) {
+        curwin->w_cursor = old_pos;
+        return FAIL;
+      }
+      start_pos = *pos;
+      curwin->w_cursor = *pos;
+      if ((end_pos = findmatch(NULL, other)) == NULL) {
+        curwin->w_cursor = old_pos;
+        return FAIL;
+      }
+      curwin->w_cursor = *end_pos;
+    } else {
+      break;
+    }
+  }
+
+  if (VIsual_active) {
+    if (*p_sel == 'e') {
+      inc(&curwin->w_cursor);
+    }
+    if (sol && gchar_cursor() != NUL) {
+      inc(&curwin->w_cursor);  // include the line break
+    }
+    VIsual = start_pos;
+    VIsual_mode = 'v';
+    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
+    showmode();
+  } else {
+    oap->start = start_pos;
+    oap->motion_type = kMTCharWise;
+    oap->inclusive = false;
+    if (sol) {
+      incl(&curwin->w_cursor);
+    } else if (ltoreq(start_pos, curwin->w_cursor)) {
+      // Include the character under the cursor.
+      oap->inclusive = true;
+    } else {
+      // End is before the start (no text in between <>, [], etc.): don't
+      // operate on any text.
+      curwin->w_cursor = start_pos;
+    }
+  }
+
+  return OK;
+}
+
+/// @param end_tag  when true, return true if the cursor is on "</aaa>".
+///
+/// @return         true if the cursor is on a "<aaa>" tag.  Ignore "<aaa/>".
+static bool in_html_tag(bool end_tag)
+{
+  char_u *line = get_cursor_line_ptr();
+  char_u *p;
+  int c;
+  int lc = NUL;
+  pos_T pos;
+
+  for (p = line + curwin->w_cursor.col; p > line;) {
+    if (*p == '<') {           // find '<' under/before cursor
+      break;
+    }
+    MB_PTR_BACK(line, p);
+    if (*p == '>') {           // find '>' before cursor
+      break;
+    }
+  }
+  if (*p != '<') {
+    return false;
+  }
+
+  pos.lnum = curwin->w_cursor.lnum;
+  pos.col = (colnr_T)(p - line);
+
+  MB_PTR_ADV(p);
+  if (end_tag) {
+    // check that there is a '/' after the '<'
+    return *p == '/';
+  }
+
+  // check that there is no '/' after the '<'
+  if (*p == '/') {
+    return false;
+  }
+
+  // check that the matching '>' is not preceded by '/'
+  for (;;) {
+    if (inc(&pos) < 0) {
+      return false;
+    }
+    c = *ml_get_pos(&pos);
+    if (c == '>') {
+      break;
+    }
+    lc = c;
+  }
+  return lc != '/';
+}
+
+/// Find tag block under the cursor, cursor at end.
+///
+/// @param include  true == include white space
+int current_tagblock(oparg_T *oap, long count_arg, bool include)
+{
+  long count = count_arg;
+  pos_T old_pos;
+  pos_T start_pos;
+  pos_T end_pos;
+  pos_T old_start, old_end;
+  char_u *p;
+  char_u *cp;
+  int len;
+  bool do_include = include;
+  bool save_p_ws = p_ws;
+  int retval = FAIL;
+  int is_inclusive = true;
+
+  p_ws = false;
+
+  old_pos = curwin->w_cursor;
+  old_end = curwin->w_cursor;               // remember where we started
+  old_start = old_end;
+  if (!VIsual_active || *p_sel == 'e') {
+    decl(&old_end);                         // old_end is inclusive
+  }
+
+  // If we start on "<aaa>" select that block.
+  if (!VIsual_active || equalpos(VIsual, curwin->w_cursor)) {
+    setpcmark();
+
+    // ignore indent
+    while (inindent(1)) {
+      if (inc_cursor() != 0) {
+        break;
+      }
+    }
+
+    if (in_html_tag(false)) {
+      // cursor on start tag, move to its '>'
+      while (*get_cursor_pos_ptr() != '>') {
+        if (inc_cursor() < 0) {
+          break;
+        }
+      }
+    } else if (in_html_tag(true)) {
+      // cursor on end tag, move to just before it
+      while (*get_cursor_pos_ptr() != '<') {
+        if (dec_cursor() < 0) {
+          break;
+        }
+      }
+      dec_cursor();
+      old_end = curwin->w_cursor;
+    }
+  } else if (lt(VIsual, curwin->w_cursor)) {
+    old_start = VIsual;
+    curwin->w_cursor = VIsual;              // cursor at low end of Visual
+  } else {
+    old_end = VIsual;
+  }
+
+again:
+  // Search backwards for unclosed "<aaa>".
+  // Put this position in start_pos.
+  for (long n = 0; n < count; n++) {
+    if (do_searchpair("<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)",
+                      "",
+                      "</[^>]*>", BACKWARD, NULL, 0,
+                      NULL, (linenr_T)0, 0L) <= 0) {
+      curwin->w_cursor = old_pos;
+      goto theend;
+    }
+  }
+  start_pos = curwin->w_cursor;
+
+  // Search for matching "</aaa>".  First isolate the "aaa".
+  inc_cursor();
+  p = get_cursor_pos_ptr();
+  for (cp = p;
+       *cp != NUL && *cp != '>' && !ascii_iswhite(*cp);
+       MB_PTR_ADV(cp)) {}
+  len = (int)(cp - p);
+  if (len == 0) {
+    curwin->w_cursor = old_pos;
+    goto theend;
+  }
+  const size_t spat_len = (size_t)len + 39;
+  char *const spat = xmalloc(spat_len);
+  const size_t epat_len = (size_t)len + 9;
+  char *const epat = xmalloc(epat_len);
+  snprintf(spat, spat_len,
+           "<%.*s\\>\\%%(\\_s\\_[^>]\\{-}\\_[^/]>\\|\\_s\\?>\\)\\c", len, p);
+  snprintf(epat, epat_len, "</%.*s>\\c", len, p);
+
+  const int r = (int)do_searchpair(spat, "", epat, FORWARD, NULL, 0, NULL, (linenr_T)0, 0L);
+
+  xfree(spat);
+  xfree(epat);
+
+  if (r < 1 || lt(curwin->w_cursor, old_end)) {
+    // Can't find other end or it's before the previous end.  Could be a
+    // HTML tag that doesn't have a matching end.  Search backwards for
+    // another starting tag.
+    count = 1;
+    curwin->w_cursor = start_pos;
+    goto again;
+  }
+
+  if (do_include) {
+    // Include up to the '>'.
+    while (*get_cursor_pos_ptr() != '>') {
+      if (inc_cursor() < 0) {
+        break;
+      }
+    }
+  } else {
+    char_u *c = get_cursor_pos_ptr();
+    // Exclude the '<' of the end tag.
+    // If the closing tag is on new line, do not decrement cursor, but make
+    // operation exclusive, so that the linefeed will be selected
+    if (*c == '<' && !VIsual_active && curwin->w_cursor.col == 0) {
+      // do not decrement cursor
+      is_inclusive = false;
+    } else if (*c == '<') {
+      dec_cursor();
+    }
+  }
+  end_pos = curwin->w_cursor;
+
+  if (!do_include) {
+    // Exclude the start tag.
+    curwin->w_cursor = start_pos;
+    while (inc_cursor() >= 0) {
+      if (*get_cursor_pos_ptr() == '>') {
+        inc_cursor();
+        start_pos = curwin->w_cursor;
+        break;
+      }
+    }
+    curwin->w_cursor = end_pos;
+
+    // If we are in Visual mode and now have the same text as before set
+    // "do_include" and try again.
+    if (VIsual_active
+        && equalpos(start_pos, old_start)
+        && equalpos(end_pos, old_end)) {
+      do_include = true;
+      curwin->w_cursor = old_start;
+      count = count_arg;
+      goto again;
+    }
+  }
+
+  if (VIsual_active) {
+    // If the end is before the start there is no text between tags, select
+    // the char under the cursor.
+    if (lt(end_pos, start_pos)) {
+      curwin->w_cursor = start_pos;
+    } else if (*p_sel == 'e') {
+      inc_cursor();
+    }
+    VIsual = start_pos;
+    VIsual_mode = 'v';
+    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
+    showmode();
+  } else {
+    oap->start = start_pos;
+    oap->motion_type = kMTCharWise;
+    if (lt(end_pos, start_pos)) {
+      // End is before the start: there is no text between tags; operate
+      // on an empty area.
+      curwin->w_cursor = start_pos;
+      oap->inclusive = false;
+    } else {
+      oap->inclusive = is_inclusive;
+    }
+  }
+  retval = OK;
+
+theend:
+  p_ws = save_p_ws;
+  return retval;
+}
+
+/// @param include  true == include white space
+/// @param type     'p' for paragraph, 'S' for section
+int current_par(oparg_T *oap, long count, bool include, int type)
+{
+  linenr_T start_lnum;
+  linenr_T end_lnum;
+  int white_in_front;
+  int dir;
+  int start_is_white;
+  int prev_start_is_white;
+  int retval = OK;
+  int do_white = false;
+  int t;
+  int i;
+
+  if (type == 'S') {        // not implemented yet
+    return FAIL;
+  }
+
+  start_lnum = curwin->w_cursor.lnum;
+
+  // When visual area is more than one line: extend it.
+  if (VIsual_active && start_lnum != VIsual.lnum) {
+extend:
+    if (start_lnum < VIsual.lnum) {
+      dir = BACKWARD;
+    } else {
+      dir = FORWARD;
+    }
+    for (i = (int)count; --i >= 0;) {
+      if (start_lnum ==
+          (dir == BACKWARD ? 1 : curbuf->b_ml.ml_line_count)) {
+        retval = FAIL;
+        break;
+      }
+
+      prev_start_is_white = -1;
+      for (t = 0; t < 2; t++) {
+        start_lnum += dir;
+        start_is_white = linewhite(start_lnum);
+        if (prev_start_is_white == start_is_white) {
+          start_lnum -= dir;
+          break;
+        }
+        for (;;) {
+          if (start_lnum == (dir == BACKWARD
+                             ? 1 : curbuf->b_ml.ml_line_count)) {
+            break;
+          }
+          if (start_is_white != linewhite(start_lnum + dir)
+              || (!start_is_white
+                  && startPS(start_lnum + (dir > 0
+                                           ? 1 : 0), 0, 0))) {
+            break;
+          }
+          start_lnum += dir;
+        }
+        if (!include) {
+          break;
+        }
+        if (start_lnum == (dir == BACKWARD
+                           ? 1 : curbuf->b_ml.ml_line_count)) {
+          break;
+        }
+        prev_start_is_white = start_is_white;
+      }
+    }
+    curwin->w_cursor.lnum = start_lnum;
+    curwin->w_cursor.col = 0;
+    return retval;
+  }
+
+  // First move back to the start_lnum of the paragraph or white lines
+  white_in_front = linewhite(start_lnum);
+  while (start_lnum > 1) {
+    if (white_in_front) {           // stop at first white line
+      if (!linewhite(start_lnum - 1)) {
+        break;
+      }
+    } else {          // stop at first non-white line of start of paragraph
+      if (linewhite(start_lnum - 1) || startPS(start_lnum, 0, 0)) {
+        break;
+      }
+    }
+    start_lnum--;
+  }
+
+  // Move past the end of any white lines.
+  end_lnum = start_lnum;
+  while (end_lnum <= curbuf->b_ml.ml_line_count && linewhite(end_lnum)) {
+    end_lnum++;
+  }
+
+  end_lnum--;
+  i = (int)count;
+  if (!include && white_in_front) {
+    i--;
+  }
+  while (i--) {
+    if (end_lnum == curbuf->b_ml.ml_line_count) {
+      return FAIL;
+    }
+
+    if (!include) {
+      do_white = linewhite(end_lnum + 1);
+    }
+
+    if (include || !do_white) {
+      end_lnum++;
+      // skip to end of paragraph
+      while (end_lnum < curbuf->b_ml.ml_line_count
+             && !linewhite(end_lnum + 1)
+             && !startPS(end_lnum + 1, 0, 0)) {
+        end_lnum++;
+      }
+    }
+
+    if (i == 0 && white_in_front && include) {
+      break;
+    }
+
+    // skip to end of white lines after paragraph
+    if (include || do_white) {
+      while (end_lnum < curbuf->b_ml.ml_line_count
+             && linewhite(end_lnum + 1)) {
+        end_lnum++;
+      }
+    }
+  }
+
+  // If there are no empty lines at the end, try to find some empty lines at
+  // the start (unless that has been done already).
+  if (!white_in_front && !linewhite(end_lnum) && include) {
+    while (start_lnum > 1 && linewhite(start_lnum - 1)) {
+      start_lnum--;
+    }
+  }
+
+  if (VIsual_active) {
+    // Problem: when doing "Vipipip" nothing happens in a single white
+    // line, we get stuck there.  Trap this here.
+    if (VIsual_mode == 'V' && start_lnum == curwin->w_cursor.lnum) {
+      goto extend;
+    }
+    if (VIsual.lnum != start_lnum) {
+      VIsual.lnum = start_lnum;
+      VIsual.col = 0;
+    }
+    VIsual_mode = 'V';
+    redraw_curbuf_later(UPD_INVERTED);  // update the inversion
+    showmode();
+  } else {
+    oap->start.lnum = start_lnum;
+    oap->start.col = 0;
+    oap->motion_type = kMTLineWise;
+  }
+  curwin->w_cursor.lnum = end_lnum;
+  curwin->w_cursor.col = 0;
+
+  return OK;
+}
+
+/// Search quote char from string line[col].
+/// Quote character escaped by one of the characters in "escape" is not counted
+/// as a quote.
+///
+/// @param escape  escape characters, can be NULL
+///
+/// @return        column number of "quotechar" or -1 when not found.
+static int find_next_quote(char_u *line, int col, int quotechar, char_u *escape)
+{
+  int c;
+
+  for (;;) {
+    c = line[col];
+    if (c == NUL) {
+      return -1;
+    } else if (escape != NULL && vim_strchr((char *)escape, c)) {
+      col++;
+      if (line[col] == NUL) {
+        return -1;
+      }
+    } else if (c == quotechar) {
+      break;
+    }
+    col += utfc_ptr2len((char *)line + col);
+  }
+  return col;
+}
+
+/// Search backwards in "line" from column "col_start" to find "quotechar".
+/// Quote character escaped by one of the characters in "escape" is not counted
+/// as a quote.
+///
+/// @param escape  escape characters, can be NULL
+///
+/// @return        the found column or zero.
+static int find_prev_quote(char_u *line, int col_start, int quotechar, char_u *escape)
+{
+  int n;
+
+  while (col_start > 0) {
+    col_start--;
+    col_start -= utf_head_off(line, line + col_start);
+    n = 0;
+    if (escape != NULL) {
+      while (col_start - n > 0 && vim_strchr((char *)escape,
+                                             line[col_start - n - 1]) != NULL) {
+        n++;
+      }
+    }
+    if (n & 1) {
+      col_start -= n;           // uneven number of escape chars, skip it
+    } else if (line[col_start] == quotechar) {
+      break;
+    }
+  }
+  return col_start;
+}
+
+/// Find quote under the cursor, cursor at end.
+///
+/// @param include    true == include quote char
+/// @param quotechar  Quote character
+///
+/// @return           true if found, else false.
+bool current_quote(oparg_T *oap, long count, bool include, int quotechar)
+  FUNC_ATTR_NONNULL_ALL
+{
+  char_u *line = get_cursor_line_ptr();
+  int col_end;
+  int col_start = curwin->w_cursor.col;
+  bool inclusive = false;
+  bool vis_empty = true;                // Visual selection <= 1 char
+  bool vis_bef_curs = false;            // Visual starts before cursor
+  bool did_exclusive_adj = false;       // adjusted pos for 'selection'
+  bool inside_quotes = false;           // Looks like "i'" done before
+  bool selected_quote = false;          // Has quote inside selection
+  int i;
+  bool restore_vis_bef = false;         // resotre VIsual on abort
+
+  // When 'selection' is "exclusive" move the cursor to where it would be
+  // with 'selection' "inclusive", so that the logic is the same for both.
+  // The cursor then is moved forward after adjusting the area.
+  if (VIsual_active) {
+    // this only works within one line
+    if (VIsual.lnum != curwin->w_cursor.lnum) {
+      return false;
+    }
+
+    vis_bef_curs = lt(VIsual, curwin->w_cursor);
+    vis_empty = equalpos(VIsual, curwin->w_cursor);
+    if (*p_sel == 'e') {
+      if (vis_bef_curs) {
+        dec_cursor();
+        did_exclusive_adj = true;
+      } else if (!vis_empty) {
+        dec(&VIsual);
+        did_exclusive_adj = true;
+      }
+      vis_empty = equalpos(VIsual, curwin->w_cursor);
+      if (!vis_bef_curs && !vis_empty) {
+        // VIsual needs to be start of Visual selection.
+        pos_T t = curwin->w_cursor;
+
+        curwin->w_cursor = VIsual;
+        VIsual = t;
+        vis_bef_curs = true;
+        restore_vis_bef = true;
+      }
+    }
+  }
+
+  if (!vis_empty) {
+    // Check if the existing selection exactly spans the text inside
+    // quotes.
+    if (vis_bef_curs) {
+      inside_quotes = VIsual.col > 0
+                      && line[VIsual.col - 1] == quotechar
+                      && line[curwin->w_cursor.col] != NUL
+                      && line[curwin->w_cursor.col + 1] == quotechar;
+      i = VIsual.col;
+      col_end = curwin->w_cursor.col;
+    } else {
+      inside_quotes = curwin->w_cursor.col > 0
+                      && line[curwin->w_cursor.col - 1] == quotechar
+                      && line[VIsual.col] != NUL
+                      && line[VIsual.col + 1] == quotechar;
+      i = curwin->w_cursor.col;
+      col_end = VIsual.col;
+    }
+
+    // Find out if we have a quote in the selection.
+    while (i <= col_end) {
+      // check for going over the end of the line, which can happen if
+      // the line was changed after the Visual area was selected.
+      if (line[i] == NUL) {
+        break;
+      }
+      if (line[i++] == quotechar) {
+        selected_quote = true;
+        break;
+      }
+    }
+  }
+
+  if (!vis_empty && line[col_start] == quotechar) {
+    // Already selecting something and on a quote character.  Find the
+    // next quoted string.
+    if (vis_bef_curs) {
+      // Assume we are on a closing quote: move to after the next
+      // opening quote.
+      col_start = find_next_quote(line, col_start + 1, quotechar, NULL);
+      if (col_start < 0) {
+        goto abort_search;
+      }
+      col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
+      if (col_end < 0) {
+        // We were on a starting quote perhaps?
+        col_end = col_start;
+        col_start = curwin->w_cursor.col;
+      }
+    } else {
+      col_end = find_prev_quote(line, col_start, quotechar, NULL);
+      if (line[col_end] != quotechar) {
+        goto abort_search;
+      }
+      col_start = find_prev_quote(line, col_end, quotechar, (char_u *)curbuf->b_p_qe);
+      if (line[col_start] != quotechar) {
+        // We were on an ending quote perhaps?
+        col_start = col_end;
+        col_end = curwin->w_cursor.col;
+      }
+    }
+  } else if (line[col_start] == quotechar || !vis_empty) {
+    int first_col = col_start;
+
+    if (!vis_empty) {
+      if (vis_bef_curs) {
+        first_col = find_next_quote(line, col_start, quotechar, NULL);
+      } else {
+        first_col = find_prev_quote(line, col_start, quotechar, NULL);
+      }
+    }
+    // The cursor is on a quote, we don't know if it's the opening or
+    // closing quote.  Search from the start of the line to find out.
+    // Also do this when there is a Visual area, a' may leave the cursor
+    // in between two strings.
+    col_start = 0;
+    for (;;) {
+      // Find open quote character.
+      col_start = find_next_quote(line, col_start, quotechar, NULL);
+      if (col_start < 0 || col_start > first_col) {
+        goto abort_search;
+      }
+      // Find close quote character.
+      col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
+      if (col_end < 0) {
+        goto abort_search;
+      }
+      // If is cursor between start and end quote character, it is
+      // target text object.
+      if (col_start <= first_col && first_col <= col_end) {
+        break;
+      }
+      col_start = col_end + 1;
+    }
+  } else {
+    // Search backward for a starting quote.
+    col_start = find_prev_quote(line, col_start, quotechar, (char_u *)curbuf->b_p_qe);
+    if (line[col_start] != quotechar) {
+      // No quote before the cursor, look after the cursor.
+      col_start = find_next_quote(line, col_start, quotechar, NULL);
+      if (col_start < 0) {
+        goto abort_search;
+      }
+    }
+
+    // Find close quote character.
+    col_end = find_next_quote(line, col_start + 1, quotechar, (char_u *)curbuf->b_p_qe);
+    if (col_end < 0) {
+      goto abort_search;
+    }
+  }
+
+  // When "include" is true, include spaces after closing quote or before
+  // the starting quote.
+  if (include) {
+    if (ascii_iswhite(line[col_end + 1])) {
+      while (ascii_iswhite(line[col_end + 1])) {
+        col_end++;
+      }
+    } else {
+      while (col_start > 0 && ascii_iswhite(line[col_start - 1])) {
+        col_start--;
+      }
+    }
+  }
+
+  // Set start position.  After vi" another i" must include the ".
+  // For v2i" include the quotes.
+  if (!include && count < 2 && (vis_empty || !inside_quotes)) {
+    col_start++;
+  }
+  curwin->w_cursor.col = col_start;
+  if (VIsual_active) {
+    // Set the start of the Visual area when the Visual area was empty, we
+    // were just inside quotes or the Visual area didn't start at a quote
+    // and didn't include a quote.
+    if (vis_empty
+        || (vis_bef_curs
+            && !selected_quote
+            && (inside_quotes
+                || (line[VIsual.col] != quotechar
+                    && (VIsual.col == 0
+                        || line[VIsual.col - 1] != quotechar))))) {
+      VIsual = curwin->w_cursor;
+      redraw_curbuf_later(UPD_INVERTED);
+    }
+  } else {
+    oap->start = curwin->w_cursor;
+    oap->motion_type = kMTCharWise;
+  }
+
+  // Set end position.
+  curwin->w_cursor.col = col_end;
+  if ((include || count > 1
+       // After vi" another i" must include the ".
+       || (!vis_empty && inside_quotes)) && inc_cursor() == 2) {
+    inclusive = true;
+  }
+  if (VIsual_active) {
+    if (vis_empty || vis_bef_curs) {
+      // decrement cursor when 'selection' is not exclusive
+      if (*p_sel != 'e') {
+        dec_cursor();
+      }
+    } else {
+      // Cursor is at start of Visual area.  Set the end of the Visual
+      // area when it was just inside quotes or it didn't end at a
+      // quote.
+      if (inside_quotes
+          || (!selected_quote
+              && line[VIsual.col] != quotechar
+              && (line[VIsual.col] == NUL
+                  || line[VIsual.col + 1] != quotechar))) {
+        dec_cursor();
+        VIsual = curwin->w_cursor;
+      }
+      curwin->w_cursor.col = col_start;
+    }
+    if (VIsual_mode == 'V') {
+      VIsual_mode = 'v';
+      redraw_cmdline = true;                    // show mode later
+    }
+  } else {
+    // Set inclusive and other oap's flags.
+    oap->inclusive = inclusive;
+  }
+
+  return true;
+
+abort_search:
+  if (VIsual_active && *p_sel == 'e') {
+    if (did_exclusive_adj) {
+      inc_cursor();
+    }
+    if (restore_vis_bef) {
+      pos_T t = curwin->w_cursor;
+
+      curwin->w_cursor = VIsual;
+      VIsual = t;
+    }
+  }
+  return false;
+}
diff --git a/src/nvim/textobject.h b/src/nvim/textobject.h
new file mode 100644
index 0000000000..26f88613fd
--- /dev/null
+++ b/src/nvim/textobject.h
@@ -0,0 +1,11 @@
+#ifndef NVIM_TEXTOBJECT_H
+#define NVIM_TEXTOBJECT_H
+
+#include "nvim/normal.h"  // for oparg_T
+#include "nvim/pos.h"  // for linenr_T
+#include "nvim/vim.h"  // for Direction
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "textobject.h.generated.h"
+#endif
+#endif  // NVIM_TEXTOBJECT_H