ex_getln: Extract local variables from getcmdline() and fix code style

Begin refactoring getcmdline() into a state that can be managed by the
`state_enter()`:

- Move local variables into a local CommandLineState structure
- Fix code style in the entire function.

1 files changed, 899 insertions, 801 deletions

diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 7b9fd1e61e..38670052bb 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -58,6 +58,7 @@
 #include "nvim/screen.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
+#include "nvim/state.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
 #include "nvim/window.h"
@@ -91,6 +92,45 @@ struct cmdline_info {
   int input_fn;                 /* when TRUE Invoked for input() function */
 };
 
+typedef struct command_line_state {
+  VimState state;
+  int firstc;
+  long count;
+  int indent;
+  int c;
+  int i;
+  int j;
+  int gotesc;                           // TRUE when <ESC> just typed
+  int do_abbr;                          // when TRUE check for abbr.
+  char_u *lookfor;                      // string to match
+  int hiscnt;                           // current history line in use
+  int histype;                          // history type to be used
+  pos_T old_cursor;
+  colnr_T old_curswant;
+  colnr_T old_leftcol;
+  linenr_T old_topline;
+  int old_topfill;
+  linenr_T old_botline;
+  int did_incsearch;
+  int incsearch_postponed;
+  int did_wild_list;                    // did wild_list() recently
+  int wim_index;                        // index in wim_flags[]
+  int res;
+  int save_msg_scroll;
+  int save_State;                       // remember State when called
+  int some_key_typed;                   // one of the keys was typed
+  // mouse drag and release events are ignored, unless they are
+  // preceded with a mouse down event
+  int ignore_drag_release;
+  int break_ctrl_c;
+  expand_T xpc;
+  long *b_im_ptr;
+  // Everything that may work recursively should save and restore the
+  // current command line in save_ccline.  That includes update_screen(), a
+  // custom status line may invoke ":normal".
+  struct cmdline_info save_ccline;
+} CommandLineState;
+
 /* The current cmdline_info.  It is initialized in getcmdline() and after that
  * used by other functions.  When invoking getcmdline() recursively it needs
  * to be saved with save_cmdline() and restored with restore_cmdline().
@@ -143,269 +183,248 @@ static int cmd_fkmap = 0;       /* Farsi mapping during command line */
 char_u *
 getcmdline (
     int firstc,
-    long count,              /* only used for incremental search */
-    int indent                     /* indent for inside conditionals */
+    long count,              // only used for incremental search
+    int indent               // indent for inside conditionals
 )
 {
-  int c;
-  int i;
-  int j;
-  int gotesc = FALSE;                   /* TRUE when <ESC> just typed */
-  int do_abbr;                          /* when TRUE check for abbr. */
-  char_u      *lookfor = NULL;          /* string to match */
-  int hiscnt;                           /* current history line in use */
-  int histype;                          /* history type to be used */
-  pos_T old_cursor;
-  colnr_T old_curswant;
-  colnr_T old_leftcol;
-  linenr_T old_topline;
-  int old_topfill;
-  linenr_T old_botline;
-  int did_incsearch = FALSE;
-  int incsearch_postponed = FALSE;
-  int did_wild_list = FALSE;            /* did wild_list() recently */
-  int wim_index = 0;                    /* index in wim_flags[] */
-  int res;
-  int save_msg_scroll = msg_scroll;
-  int save_State = State;               /* remember State when called */
-  int some_key_typed = FALSE;           /* one of the keys was typed */
-  /* mouse drag and release events are ignored, unless they are
-   * preceded with a mouse down event */
-  int ignore_drag_release = TRUE;
-  int break_ctrl_c = FALSE;
-  expand_T xpc;
-  long        *b_im_ptr = NULL;
-  /* Everything that may work recursively should save and restore the
-   * current command line in save_ccline.  That includes update_screen(), a
-   * custom status line may invoke ":normal". */
-  struct cmdline_info save_ccline;
-
-  if (firstc == -1) {
-    firstc = NUL;
-    break_ctrl_c = TRUE;
+  CommandLineState state, *s = &state;
+  memset(s, 0, sizeof(CommandLineState));
+  s->firstc = firstc;
+  s->count = count;
+  s->indent = indent;
+  s->save_msg_scroll = msg_scroll;
+  s->save_State = State;
+  s->ignore_drag_release = true;
+
+  if (s->firstc == -1) {
+    s->firstc = NUL;
+    s->break_ctrl_c = true;
   }
-  /* start without Hebrew mapping for a command line */
-  if (firstc == ':' || firstc == '=' || firstc == '>')
+
+  // start without Hebrew mapping for a command line
+  if (s->firstc == ':' || s->firstc == '=' || s->firstc == '>') {
     cmd_hkmap = 0;
+  }
 
-  ccline.overstrike = FALSE;                /* always start in insert mode */
-  old_cursor = curwin->w_cursor;            /* needs to be restored later */
-  old_curswant = curwin->w_curswant;
-  old_leftcol = curwin->w_leftcol;
-  old_topline = curwin->w_topline;
-  old_topfill = curwin->w_topfill;
-  old_botline = curwin->w_botline;
+  ccline.overstrike = false;                // always start in insert mode
+  s->old_cursor = curwin->w_cursor;         // needs to be restored later
+  s->old_curswant = curwin->w_curswant;
+  s->old_leftcol = curwin->w_leftcol;
+  s->old_topline = curwin->w_topline;
+  s->old_topfill = curwin->w_topfill;
+  s->old_botline = curwin->w_botline;
 
-  /*
-   * set some variables for redrawcmd()
-   */
-  ccline.cmdfirstc = (firstc == '@' ? 0 : firstc);
-  ccline.cmdindent = (firstc > 0 ? indent : 0);
+  // set some variables for redrawcmd()
+  ccline.cmdfirstc = (s->firstc == '@' ? 0 : s->firstc);
+  ccline.cmdindent = (s->firstc > 0 ? s->indent : 0);
 
-  /* alloc initial ccline.cmdbuff */
-  alloc_cmdbuff(exmode_active ? 250 : indent + 1);
+  // alloc initial ccline.cmdbuff
+  alloc_cmdbuff(exmode_active ? 250 : s->indent + 1);
   ccline.cmdlen = ccline.cmdpos = 0;
   ccline.cmdbuff[0] = NUL;
 
-  /* autoindent for :insert and :append */
-  if (firstc <= 0) {
-    memset(ccline.cmdbuff, ' ', indent);
-    ccline.cmdbuff[indent] = NUL;
-    ccline.cmdpos = indent;
-    ccline.cmdspos = indent;
-    ccline.cmdlen = indent;
+  // autoindent for :insert and :append
+  if (s->firstc <= 0) {
+    memset(ccline.cmdbuff, ' ', s->indent);
+    ccline.cmdbuff[s->indent] = NUL;
+    ccline.cmdpos = s->indent;
+    ccline.cmdspos = s->indent;
+    ccline.cmdlen = s->indent;
   }
 
-  ExpandInit(&xpc);
-  ccline.xpc = &xpc;
+  ExpandInit(&s->xpc);
+  ccline.xpc = &s->xpc;
 
   if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
-      && (firstc == '/' || firstc == '?'))
-    cmdmsg_rl = TRUE;
-  else
-    cmdmsg_rl = FALSE;
+      && (s->firstc == '/' || s->firstc == '?')) {
+    cmdmsg_rl = true;
+  } else {
+    cmdmsg_rl = false;
+  }
 
-  redir_off = TRUE;             /* don't redirect the typed command */
+  redir_off = true;             // don't redirect the typed command
   if (!cmd_silent) {
-    i = msg_scrolled;
-    msg_scrolled = 0;                   /* avoid wait_return message */
-    gotocmdline(TRUE);
-    msg_scrolled += i;
-    redrawcmdprompt();                  /* draw prompt or indent */
+    s->i = msg_scrolled;
+    msg_scrolled = 0;           // avoid wait_return message
+    gotocmdline(true);
+    msg_scrolled += s->i;
+    redrawcmdprompt();          // draw prompt or indent
     set_cmdspos();
   }
-  xpc.xp_context = EXPAND_NOTHING;
-  xpc.xp_backslash = XP_BS_NONE;
+  s->xpc.xp_context = EXPAND_NOTHING;
+  s->xpc.xp_backslash = XP_BS_NONE;
 #ifndef BACKSLASH_IN_FILENAME
-  xpc.xp_shell = FALSE;
+  s->xpc.xp_shell = false;
 #endif
 
   if (ccline.input_fn) {
-    xpc.xp_context = ccline.xp_context;
-    xpc.xp_pattern = ccline.cmdbuff;
-    xpc.xp_arg = ccline.xp_arg;
+    s->xpc.xp_context = ccline.xp_context;
+    s->xpc.xp_pattern = ccline.cmdbuff;
+    s->xpc.xp_arg = ccline.xp_arg;
   }
 
-  /*
-   * Avoid scrolling when called by a recursive do_cmdline(), e.g. when
-   * doing ":@0" when register 0 doesn't contain a CR.
-   */
-  msg_scroll = FALSE;
+  // Avoid scrolling when called by a recursive do_cmdline(), e.g. when
+  // doing ":@0" when register 0 doesn't contain a CR.
+  msg_scroll = false;
 
   State = CMDLINE;
 
-  if (firstc == '/' || firstc == '?' || firstc == '@') {
-    /* Use ":lmap" mappings for search pattern and input(). */
-    if (curbuf->b_p_imsearch == B_IMODE_USE_INSERT)
-      b_im_ptr = &curbuf->b_p_iminsert;
-    else
-      b_im_ptr = &curbuf->b_p_imsearch;
-    if (*b_im_ptr == B_IMODE_LMAP)
+  if (s->firstc == '/' || s->firstc == '?' || s->firstc == '@') {
+    // Use ":lmap" mappings for search pattern and input().
+    if (curbuf->b_p_imsearch == B_IMODE_USE_INSERT) {
+      s->b_im_ptr = &curbuf->b_p_iminsert;
+    } else {
+      s->b_im_ptr = &curbuf->b_p_imsearch;
+    }
+
+    if (*s->b_im_ptr == B_IMODE_LMAP) {
       State |= LANGMAP;
+    }
   }
 
   setmouse();
-  ui_cursor_shape();            /* may show different cursor shape */
+  ui_cursor_shape();               // may show different cursor shape
 
   init_history();
-  hiscnt = hislen;              /* set hiscnt to impossible history value */
-  histype = hist_char2type(firstc);
-
-  do_digraph(-1);               /* init digraph typeahead */
+  s->hiscnt = hislen;              // set hiscnt to impossible history value
+  s->histype = hist_char2type(s->firstc);
+  do_digraph(-1);                       // init digraph typeahead
 
   // If something above caused an error, reset the flags, we do want to type
   // and execute commands. Display may be messed up a bit.
   if (did_emsg) {
     redrawcmd();
   }
-  did_emsg = FALSE;
-  got_int = FALSE;
 
-  /*
-   * Collect the command string, handling editing keys.
-   */
-  for (;; ) {
-    redir_off = TRUE;           /* Don't redirect the typed command.
-                                   Repeated, because a ":redir" inside
-                                   completion may switch it on. */
-    quit_more = FALSE;          /* reset after CTRL-D which had a more-prompt */
+  did_emsg = false;
+  got_int = false;
 
-    cursorcmd();                /* set the cursor on the right spot */
+  // Collect the command string, handling editing keys.
+  for (;;) {
+    redir_off = true;           // Don't redirect the typed command.
+                                // Repeated, because a ":redir" inside
+                                // completion may switch it on.
+    quit_more = false;          // reset after CTRL-D which had a more-prompt
 
-    /* Get a character.  Ignore K_IGNORE, it should not do anything, such
-     * as stop completion. */
+    cursorcmd();                // set the cursor on the right spot
+
+    // Get a character.  Ignore K_IGNORE, it should not do anything, such
+    // as stop completion.
     input_enable_events();
     do {
-      c = safe_vgetc();
-    } while (c == K_IGNORE || c == K_PASTE);
+      s->c = safe_vgetc();
+    } while (s->c == K_IGNORE || s->c == K_PASTE);
     input_disable_events();
 
-    if (c == K_EVENT) {
+    if (s->c == K_EVENT) {
       queue_process_events(loop.events);
       continue;
     }
 
     if (KeyTyped) {
-      some_key_typed = TRUE;
-      if (cmd_hkmap)
-        c = hkmap(c);
-      if (cmd_fkmap)
-        c = cmdl_fkmap(c);
+      s->some_key_typed = true;
+      if (cmd_hkmap) {
+        s->c = hkmap(s->c);
+      }
+
+      if (cmd_fkmap) {
+        s->c = cmdl_fkmap(s->c);
+      }
+
       if (cmdmsg_rl && !KeyStuffed) {
-        /* Invert horizontal movements and operations.  Only when
-         * typed by the user directly, not when the result of a
-         * mapping. */
-        switch (c) {
-        case K_RIGHT:   c = K_LEFT; break;
-        case K_S_RIGHT: c = K_S_LEFT; break;
-        case K_C_RIGHT: c = K_C_LEFT; break;
-        case K_LEFT:    c = K_RIGHT; break;
-        case K_S_LEFT:  c = K_S_RIGHT; break;
-        case K_C_LEFT:  c = K_C_RIGHT; break;
+        // Invert horizontal movements and operations.  Only when
+        // typed by the user directly, not when the result of a
+        // mapping.
+        switch (s->c) {
+        case K_RIGHT:   s->c = K_LEFT; break;
+        case K_S_RIGHT: s->c = K_S_LEFT; break;
+        case K_C_RIGHT: s->c = K_C_LEFT; break;
+        case K_LEFT:    s->c = K_RIGHT; break;
+        case K_S_LEFT:  s->c = K_S_RIGHT; break;
+        case K_C_LEFT:  s->c = K_C_RIGHT; break;
         }
       }
     }
 
-    /*
-     * Ignore got_int when CTRL-C was typed here.
-     * Don't ignore it in :global, we really need to break then, e.g., for
-     * ":g/pat/normal /pat" (without the <CR>).
-     * Don't ignore it for the input() function.
-     */
-    if ((c == Ctrl_C
-#ifdef UNIX
-         || c == intr_char
-#endif
-         )
-        && firstc != '@'
-        && !break_ctrl_c
-        && !global_busy)
-      got_int = FALSE;
-
-    /* free old command line when finished moving around in the history
-     * list */
-    if (lookfor != NULL
-        && c != K_S_DOWN && c != K_S_UP
-        && c != K_DOWN && c != K_UP
-        && c != K_PAGEDOWN && c != K_PAGEUP
-        && c != K_KPAGEDOWN && c != K_KPAGEUP
-        && c != K_LEFT && c != K_RIGHT
-        && (xpc.xp_numfiles > 0 || (c != Ctrl_P && c != Ctrl_N))) {
-      xfree(lookfor);
-      lookfor = NULL;
+    // Ignore got_int when CTRL-C was typed here.
+    // Don't ignore it in :global, we really need to break then, e.g., for
+    // ":g/pat/normal /pat" (without the <CR>).
+    // Don't ignore it for the input() function.
+    if ((s->c == Ctrl_C)
+        && s->firstc != '@'
+        && !s->break_ctrl_c
+        && !global_busy) {
+      got_int = false;
     }
 
-    /*
-     * When there are matching completions to select <S-Tab> works like
-     * CTRL-P (unless 'wc' is <S-Tab>).
-     */
-    if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
-      c = Ctrl_P;
-
-    /* Special translations for 'wildmenu' */
-    if (did_wild_list && p_wmnu) {
-      if (c == K_LEFT)
-        c = Ctrl_P;
-      else if (c == K_RIGHT)
-        c = Ctrl_N;
+    // free old command line when finished moving around in the history
+    // list
+    if (s->lookfor != NULL
+        && s->c != K_S_DOWN && s->c != K_S_UP
+        && s->c != K_DOWN && s->c != K_UP
+        && s->c != K_PAGEDOWN && s->c != K_PAGEUP
+        && s->c != K_KPAGEDOWN && s->c != K_KPAGEUP
+        && s->c != K_LEFT && s->c != K_RIGHT
+        && (s->xpc.xp_numfiles > 0 || (s->c != Ctrl_P && s->c != Ctrl_N))) {
+      xfree(s->lookfor);
+      s->lookfor = NULL;
+    }
+
+    // When there are matching completions to select <S-Tab> works like
+    // CTRL-P (unless 'wc' is <S-Tab>).
+    if (s->c != p_wc && s->c == K_S_TAB && s->xpc.xp_numfiles > 0) {
+      s->c = Ctrl_P;
+    }
+
+    // Special translations for 'wildmenu'
+    if (s->did_wild_list && p_wmnu) {
+      if (s->c == K_LEFT) {
+        s->c = Ctrl_P;
+      } else if (s->c == K_RIGHT) {
+        s->c = Ctrl_N;
+      }
     }
-    /* Hitting CR after "emenu Name.": complete submenu */
-    if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu
+
+    // Hitting CR after "emenu Name.": complete submenu
+    if (s->xpc.xp_context == EXPAND_MENUNAMES && p_wmnu
         && ccline.cmdpos > 1
         && ccline.cmdbuff[ccline.cmdpos - 1] == '.'
         && ccline.cmdbuff[ccline.cmdpos - 2] != '\\'
-        && (c == '\n' || c == '\r' || c == K_KENTER))
-      c = K_DOWN;
-
-    /* free expanded names when finished walking through matches */
-    if (xpc.xp_numfiles != -1
-        && !(c == p_wc && KeyTyped) && c != p_wcm
-        && c != Ctrl_N && c != Ctrl_P && c != Ctrl_A
-        && c != Ctrl_L) {
-      (void)ExpandOne(&xpc, NULL, NULL, 0, WILD_FREE);
-      did_wild_list = FALSE;
-      if (!p_wmnu || (c != K_UP && c != K_DOWN))
-        xpc.xp_context = EXPAND_NOTHING;
-      wim_index = 0;
+        && (s->c == '\n' || s->c == '\r' || s->c == K_KENTER)) {
+      s->c = K_DOWN;
+    }
+
+    // free expanded names when finished walking through matches
+    if (s->xpc.xp_numfiles != -1
+        && !(s->c == p_wc && KeyTyped) && s->c != p_wcm
+        && s->c != Ctrl_N && s->c != Ctrl_P && s->c != Ctrl_A
+        && s->c != Ctrl_L) {
+      (void)ExpandOne(&s->xpc, NULL, NULL, 0, WILD_FREE);
+      s->did_wild_list = false;
+      if (!p_wmnu || (s->c != K_UP && s->c != K_DOWN)) {
+        s->xpc.xp_context = EXPAND_NOTHING;
+      }
+      s->wim_index = 0;
       if (p_wmnu && wild_menu_showing != 0) {
         int skt = KeyTyped;
         int old_RedrawingDisabled = RedrawingDisabled;
 
-        if (ccline.input_fn)
+        if (ccline.input_fn) {
           RedrawingDisabled = 0;
+        }
 
         if (wild_menu_showing == WM_SCROLLED) {
-          /* Entered command line, move it up */
+          // Entered command line, move it up
           cmdline_row--;
           redrawcmd();
         } else if (save_p_ls != -1) {
-          /* restore 'laststatus' and 'winminheight' */
+          // restore 'laststatus' and 'winminheight'
           p_ls = save_p_ls;
           p_wmh = save_p_wmh;
-          last_status(FALSE);
-          save_cmdline(&save_ccline);
-          update_screen(VALID);                 /* redraw the screen NOW */
-          restore_cmdline(&save_ccline);
+          last_status(false);
+          save_cmdline(&s->save_ccline);
+          update_screen(VALID);                 // redraw the screen NOW
+          restore_cmdline(&s->save_ccline);
           redrawcmd();
           save_p_ls = -1;
         } else {
@@ -414,50 +433,54 @@ getcmdline (
         }
         KeyTyped = skt;
         wild_menu_showing = 0;
-        if (ccline.input_fn)
+        if (ccline.input_fn) {
           RedrawingDisabled = old_RedrawingDisabled;
+        }
       }
     }
 
-    /* Special translations for 'wildmenu' */
-    if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) {
-      /* Hitting <Down> after "emenu Name.": complete submenu */
-      if (c == K_DOWN && ccline.cmdpos > 0
-          && ccline.cmdbuff[ccline.cmdpos - 1] == '.')
-        c = p_wc;
-      else if (c == K_UP) {
-        /* Hitting <Up>: Remove one submenu name in front of the
-         * cursor */
-        int found = FALSE;
-
-        j = (int)(xpc.xp_pattern - ccline.cmdbuff);
-        i = 0;
-        while (--j > 0) {
-          /* check for start of menu name */
-          if (ccline.cmdbuff[j] == ' '
-              && ccline.cmdbuff[j - 1] != '\\') {
-            i = j + 1;
+    // Special translations for 'wildmenu'
+    if (s->xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) {
+      // Hitting <Down> after "emenu Name.": complete submenu
+      if (s->c == K_DOWN && ccline.cmdpos > 0
+          && ccline.cmdbuff[ccline.cmdpos - 1] == '.') {
+        s->c = p_wc;
+      } else if (s->c == K_UP) {
+        // Hitting <Up>: Remove one submenu name in front of the
+        // cursor
+        int found = false;
+
+        s->j = (int)(s->xpc.xp_pattern - ccline.cmdbuff);
+        s->i = 0;
+        while (--s->j > 0) {
+          // check for start of menu name
+          if (ccline.cmdbuff[s->j] == ' '
+              && ccline.cmdbuff[s->j - 1] != '\\') {
+            s->i = s->j + 1;
             break;
           }
-          /* check for start of submenu name */
-          if (ccline.cmdbuff[j] == '.'
-              && ccline.cmdbuff[j - 1] != '\\') {
+
+          // check for start of submenu name
+          if (ccline.cmdbuff[s->j] == '.'
+              && ccline.cmdbuff[s->j - 1] != '\\') {
             if (found) {
-              i = j + 1;
+              s->i = s->j + 1;
               break;
-            } else
-              found = TRUE;
+            } else {
+              found = true;
+            }
           }
         }
-        if (i > 0)
-          cmdline_del(i);
-        c = p_wc;
-        xpc.xp_context = EXPAND_NOTHING;
+        if (s->i > 0) {
+          cmdline_del(s->i);
+        }
+        s->c = p_wc;
+        s->xpc.xp_context = EXPAND_NOTHING;
       }
     }
-    if ((xpc.xp_context == EXPAND_FILES
-         || xpc.xp_context == EXPAND_DIRECTORIES
-         || xpc.xp_context == EXPAND_SHELLCMD) && p_wmnu) {
+    if ((s->xpc.xp_context == EXPAND_FILES
+         || s->xpc.xp_context == EXPAND_DIRECTORIES
+         || s->xpc.xp_context == EXPAND_SHELLCMD) && p_wmnu) {
       char_u upseg[5];
 
       upseg[0] = PATHSEP;
@@ -466,124 +489,129 @@ getcmdline (
       upseg[3] = PATHSEP;
       upseg[4] = NUL;
 
-      if (c == K_DOWN
+      if (s->c == K_DOWN
           && ccline.cmdpos > 0
           && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
           && (ccline.cmdpos < 3
               || ccline.cmdbuff[ccline.cmdpos - 2] != '.'
               || ccline.cmdbuff[ccline.cmdpos - 3] != '.')) {
-        /* go down a directory */
-        c = p_wc;
-      } else if (STRNCMP(xpc.xp_pattern, upseg + 1, 3) == 0 && c == K_DOWN) {
-        /* If in a direct ancestor, strip off one ../ to go down */
-        int found = FALSE;
-
-        j = ccline.cmdpos;
-        i = (int)(xpc.xp_pattern - ccline.cmdbuff);
-        while (--j > i) {
-          if (has_mbyte)
-            j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + j);
-          if (vim_ispathsep(ccline.cmdbuff[j])) {
-            found = TRUE;
+        // go down a directory
+        s->c = p_wc;
+      } else if (STRNCMP(s->xpc.xp_pattern, upseg + 1, 3) == 0
+          && s->c == K_DOWN) {
+        // If in a direct ancestor, strip off one ../ to go down
+        int found = false;
+
+        s->j = ccline.cmdpos;
+        s->i = (int)(s->xpc.xp_pattern - ccline.cmdbuff);
+        while (--s->j > s->i) {
+          if (has_mbyte) {
+            s->j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + s->j);
+          }
+          if (vim_ispathsep(ccline.cmdbuff[s->j])) {
+            found = true;
             break;
           }
         }
         if (found
-            && ccline.cmdbuff[j - 1] == '.'
-            && ccline.cmdbuff[j - 2] == '.'
-            && (vim_ispathsep(ccline.cmdbuff[j - 3]) || j == i + 2)) {
-          cmdline_del(j - 2);
-          c = p_wc;
+            && ccline.cmdbuff[s->j - 1] == '.'
+            && ccline.cmdbuff[s->j - 2] == '.'
+            && (vim_ispathsep(ccline.cmdbuff[s->j - 3]) || s->j == s->i + 2)) {
+          cmdline_del(s->j - 2);
+          s->c = p_wc;
         }
-      } else if (c == K_UP) {
-        /* go up a directory */
-        int found = FALSE;
-
-        j = ccline.cmdpos - 1;
-        i = (int)(xpc.xp_pattern - ccline.cmdbuff);
-        while (--j > i) {
-          if (has_mbyte)
-            j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + j);
-          if (vim_ispathsep(ccline.cmdbuff[j])
+      } else if (s->c == K_UP) {
+        // go up a directory
+        int found = false;
+
+        s->j = ccline.cmdpos - 1;
+        s->i = (int)(s->xpc.xp_pattern - ccline.cmdbuff);
+        while (--s->j > s->i) {
+          if (has_mbyte) {
+            s->j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + s->j);
+          }
+          if (vim_ispathsep(ccline.cmdbuff[s->j])
 #ifdef BACKSLASH_IN_FILENAME
               && vim_strchr(" *?[{`$%#", ccline.cmdbuff[j + 1])
               == NULL
 #endif
               ) {
             if (found) {
-              i = j + 1;
+              s->i = s->j + 1;
               break;
-            } else
-              found = TRUE;
+            } else {
+              found = true;
+            }
           }
         }
 
-        if (!found)
-          j = i;
-        else if (STRNCMP(ccline.cmdbuff + j, upseg, 4) == 0)
-          j += 4;
-        else if (STRNCMP(ccline.cmdbuff + j, upseg + 1, 3) == 0
-                 && j == i)
-          j += 3;
-        else
-          j = 0;
-        if (j > 0) {
-          /* TODO this is only for DOS/UNIX systems - need to put in
-           * machine-specific stuff here and in upseg init */
-          cmdline_del(j);
-          put_on_cmdline(upseg + 1, 3, FALSE);
-        } else if (ccline.cmdpos > i)
-          cmdline_del(i);
-
-        /* Now complete in the new directory. Set KeyTyped in case the
-         * Up key came from a mapping. */
-        c = p_wc;
-        KeyTyped = TRUE;
+        if (!found) {
+          s->j = s->i;
+        } else if (STRNCMP(ccline.cmdbuff + s->j, upseg, 4) == 0) {
+          s->j += 4;
+        } else if (STRNCMP(ccline.cmdbuff + s->j, upseg + 1, 3) == 0
+                 && s->j == s->i) {
+          s->j += 3;
+        } else {
+          s->j = 0;
+        }
+
+        if (s->j > 0) {
+          // TODO(tarruda): this is only for DOS/UNIX systems - need to put in
+          // machine-specific stuff here and in upseg init
+          cmdline_del(s->j);
+          put_on_cmdline(upseg + 1, 3, false);
+        } else if (ccline.cmdpos > s->i) {
+          cmdline_del(s->i);
+        }
+
+        // Now complete in the new directory. Set KeyTyped in case the
+        // Up key came from a mapping.
+        s->c = p_wc;
+        KeyTyped = true;
       }
     }
 
-
-    /* CTRL-\ CTRL-N goes to Normal mode, CTRL-\ CTRL-G goes to Insert
-     * mode when 'insertmode' is set, CTRL-\ e prompts for an expression. */
-    if (c == Ctrl_BSL) {
+    // CTRL-\ CTRL-N goes to Normal mode, CTRL-\ CTRL-G goes to Insert
+    // mode when 'insertmode' is set, CTRL-\ e prompts for an expression.
+    if (s->c == Ctrl_BSL) {
       ++no_mapping;
       ++allow_keys;
-      c = plain_vgetc();
+      s->c = plain_vgetc();
       --no_mapping;
       --allow_keys;
-      /* CTRL-\ e doesn't work when obtaining an expression, unless it
-       * is in a mapping. */
-      if (c != Ctrl_N && c != Ctrl_G && (c != 'e'
+      // CTRL-\ e doesn't work when obtaining an expression, unless it
+      // is in a mapping.
+      if (s->c != Ctrl_N && s->c != Ctrl_G && (s->c != 'e'
                                          || (ccline.cmdfirstc == '=' &&
                                              KeyTyped))) {
-        vungetc(c);
-        c = Ctrl_BSL;
-      } else if (c == 'e') {
+        vungetc(s->c);
+        s->c = Ctrl_BSL;
+      } else if (s->c == 'e') {
         char_u  *p = NULL;
         int len;
 
-        /*
-         * Replace the command line with the result of an expression.
-         * Need to save and restore the current command line, to be
-         * able to enter a new one...
-         */
-        if (ccline.cmdpos == ccline.cmdlen)
-          new_cmdpos = 99999;           /* keep it at the end */
-        else
+        // Replace the command line with the result of an expression.
+        // Need to save and restore the current command line, to be
+        // able to enter a new one...
+        if (ccline.cmdpos == ccline.cmdlen) {
+          new_cmdpos = 99999;           // keep it at the end
+        } else {
           new_cmdpos = ccline.cmdpos;
+        }
 
-        save_cmdline(&save_ccline);
-        c = get_expr_register();
-        restore_cmdline(&save_ccline);
-        if (c == '=') {
-          /* Need to save and restore ccline.  And set "textlock"
-           * to avoid nasty things like going to another buffer when
-           * evaluating an expression. */
-          save_cmdline(&save_ccline);
+        save_cmdline(&s->save_ccline);
+        s->c = get_expr_register();
+        restore_cmdline(&s->save_ccline);
+        if (s->c == '=') {
+          // Need to save and restore ccline.  And set "textlock"
+          // to avoid nasty things like going to another buffer when
+          // evaluating an expression.
+          save_cmdline(&s->save_ccline);
           ++textlock;
           p = get_expr_line();
           --textlock;
-          restore_cmdline(&save_ccline);
+          restore_cmdline(&s->save_ccline);
 
           if (p != NULL) {
             len = (int)STRLEN(p);
@@ -592,62 +620,66 @@ getcmdline (
             STRCPY(ccline.cmdbuff, p);
             xfree(p);
 
-            /* Restore the cursor or use the position set with
-             * set_cmdline_pos(). */
-            if (new_cmdpos > ccline.cmdlen)
+            // Restore the cursor or use the position set with
+            // set_cmdline_pos().
+            if (new_cmdpos > ccline.cmdlen) {
               ccline.cmdpos = ccline.cmdlen;
-            else
+            } else {
               ccline.cmdpos = new_cmdpos;
+            }
 
-            KeyTyped = FALSE;                 /* Don't do p_wc completion. */
+            KeyTyped = false;                 // Don't do p_wc completion.
             redrawcmd();
             goto cmdline_changed;
           }
         }
         beep_flush();
-        got_int = FALSE;                /* don't abandon the command line */
-        did_emsg = FALSE;
-        emsg_on_display = FALSE;
+        got_int = false;                // don't abandon the command line
+        did_emsg = false;
+        emsg_on_display = false;
         redrawcmd();
         goto cmdline_not_changed;
       } else {
-        if (c == Ctrl_G && p_im && restart_edit == 0)
+        if (s->c == Ctrl_G && p_im && restart_edit == 0) {
           restart_edit = 'a';
-        gotesc = TRUE;          /* will free ccline.cmdbuff after putting it
-                                   in history */
-        goto returncmd;         /* back to Normal mode */
+        }
+        s->gotesc = true;        // will free ccline.cmdbuff after putting it
+                                 // in history
+        goto returncmd;          // back to Normal mode
       }
     }
 
-    if (c == cedit_key || c == K_CMDWIN) {
-      if (ex_normal_busy == 0 && got_int == FALSE) {
-        /*
-         * Open a window to edit the command line (and history).
-         */
-        c = ex_window();
-        some_key_typed = TRUE;
+    if (s->c == cedit_key || s->c == K_CMDWIN) {
+      if (ex_normal_busy == 0 && got_int == false) {
+        // Open a window to edit the command line (and history).
+        s->c = ex_window();
+        s->some_key_typed = true;
       }
-    } else
-      c = do_digraph(c);
-
-    if (c == '\n' || c == '\r' || c == K_KENTER || (c == ESC
-                                                    && (!KeyTyped ||
-                                                        vim_strchr(p_cpo,
-                                                            CPO_ESC) !=
-                                                        NULL))) {
-      /* In Ex mode a backslash escapes a newline. */
+    } else {
+      s->c = do_digraph(s->c);
+    }
+
+    if (s->c == '\n'
+        || s->c == '\r'
+        || s->c == K_KENTER
+        || (s->c == ESC
+          && (!KeyTyped || vim_strchr(p_cpo, CPO_ESC) != NULL))) {
+      // In Ex mode a backslash escapes a newline.
       if (exmode_active
-          && c != ESC
+          && s->c != ESC
           && ccline.cmdpos == ccline.cmdlen
           && ccline.cmdpos > 0
           && ccline.cmdbuff[ccline.cmdpos - 1] == '\\') {
-        if (c == K_KENTER)
-          c = '\n';
+        if (s->c == K_KENTER) {
+          s->c = '\n';
+        }
       } else {
-        gotesc = FALSE;         /* Might have typed ESC previously, don't
-                                       truncate the cmdline now. */
-        if (ccheck_abbr(c + ABBR_OFF))
+        s->gotesc = false;         // Might have typed ESC previously, don't
+                                   // truncate the cmdline now.
+        if (ccheck_abbr(s->c + ABBR_OFF)) {
           goto cmdline_changed;
+        }
+
         if (!cmd_silent) {
           ui_cursor_goto(msg_row, 0);
           ui_flush();
@@ -656,357 +688,406 @@ getcmdline (
       }
     }
 
-    /*
-     * Completion for 'wildchar' or 'wildcharm' key.
-     * - hitting <ESC> twice means: abandon command line.
-     * - wildcard expansion is only done when the 'wildchar' key is really
-     *   typed, not when it comes from a macro
-     */
-    if ((c == p_wc && !gotesc && KeyTyped) || c == p_wcm) {
-      if (xpc.xp_numfiles > 0) {       /* typed p_wc at least twice */
-        /* if 'wildmode' contains "list" may still need to list */
-        if (xpc.xp_numfiles > 1
-            && !did_wild_list
-            && (wim_flags[wim_index] & WIM_LIST)) {
-          (void)showmatches(&xpc, FALSE);
+    // Completion for 'wildchar' or 'wildcharm' key.
+    // - hitting <ESC> twice means: abandon command line.
+    // - wildcard expansion is only done when the 'wildchar' key is really
+    //   typed, not when it comes from a macro
+    if ((s->c == p_wc && !s->gotesc && KeyTyped) || s->c == p_wcm) {
+      if (s->xpc.xp_numfiles > 0) {       // typed p_wc at least twice
+        // if 'wildmode' contains "list" may still need to list
+        if (s->xpc.xp_numfiles > 1
+            && !s->did_wild_list
+            && (wim_flags[s->wim_index] & WIM_LIST)) {
+          (void)showmatches(&s->xpc, false);
           redrawcmd();
-          did_wild_list = TRUE;
+          s->did_wild_list = true;
         }
-        if (wim_flags[wim_index] & WIM_LONGEST)
-          res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP,
-              firstc != '@');
-        else if (wim_flags[wim_index] & WIM_FULL)
-          res = nextwild(&xpc, WILD_NEXT, WILD_NO_BEEP,
-              firstc != '@');
-        else
-          res = OK;                 /* don't insert 'wildchar' now */
-      } else {                    /* typed p_wc first time */
-        wim_index = 0;
-        j = ccline.cmdpos;
-        /* if 'wildmode' first contains "longest", get longest
-         * common part */
-        if (wim_flags[0] & WIM_LONGEST)
-          res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP,
-              firstc != '@');
-        else
-          res = nextwild(&xpc, WILD_EXPAND_KEEP, WILD_NO_BEEP,
-              firstc != '@');
 
-        /* if interrupted while completing, behave like it failed */
+        if (wim_flags[s->wim_index] & WIM_LONGEST) {
+          s->res = nextwild(&s->xpc, WILD_LONGEST, WILD_NO_BEEP,
+              s->firstc != '@');
+        } else if (wim_flags[s->wim_index] & WIM_FULL) {
+          s->res = nextwild(&s->xpc, WILD_NEXT, WILD_NO_BEEP,
+              s->firstc != '@');
+        } else {
+          s->res = OK;                 // don't insert 'wildchar' now
+        }
+      } else {                    // typed p_wc first time
+        s->wim_index = 0;
+        s->j = ccline.cmdpos;
+
+        // if 'wildmode' first contains "longest", get longest