Fix lint error

2 files changed, 59 insertions, 61 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index a5dc92ec53..7614e6365a 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -87,36 +87,36 @@ struct block_def {
  */
 static char opchars[][3] =
 {
-  {NUL, NUL, FALSE},    /* OP_NOP */
-  {'d', NUL, FALSE},    /* OP_DELETE */
-  {'y', NUL, FALSE},    /* OP_YANK */
-  {'c', NUL, FALSE},    /* OP_CHANGE */
-  {'<', NUL, TRUE},     /* OP_LSHIFT */
-  {'>', NUL, TRUE},     /* OP_RSHIFT */
-  {'!', NUL, TRUE},     /* OP_FILTER */
-  {'g', '~', FALSE},    /* OP_TILDE */
-  {'=', NUL, TRUE},     /* OP_INDENT */
-  {'g', 'q', TRUE},     /* OP_FORMAT */
-  {':', NUL, TRUE},     /* OP_COLON */
-  {'g', 'U', FALSE},    /* OP_UPPER */
-  {'g', 'u', FALSE},    /* OP_LOWER */
-  {'J', NUL, TRUE},     /* DO_JOIN */
-  {'g', 'J', TRUE},     /* DO_JOIN_NS */
-  {'g', '?', FALSE},    /* OP_ROT13 */
-  {'r', NUL, FALSE},    /* OP_REPLACE */
-  {'I', NUL, FALSE},    /* OP_INSERT */
-  {'A', NUL, FALSE},    /* OP_APPEND */
-  {'z', 'f', TRUE},     /* OP_FOLD */
-  {'z', 'o', TRUE},     /* OP_FOLDOPEN */
-  {'z', 'O', TRUE},     /* OP_FOLDOPENREC */
-  {'z', 'c', TRUE},     /* OP_FOLDCLOSE */
-  {'z', 'C', TRUE},     /* OP_FOLDCLOSEREC */
-  {'z', 'd', TRUE},     /* OP_FOLDDEL */
-  {'z', 'D', TRUE},     /* OP_FOLDDELREC */
-  {'g', 'w', TRUE},     /* OP_FORMAT2 */
-  {'g', '@', FALSE},    /* OP_FUNCTION */
-  {Ctrl_A, NUL, false}, // OP_NR_ADD
-  {Ctrl_X, NUL, false}, // OP_NR_SUB
+  { NUL,    NUL, false },    // OP_NOP
+  { 'd',    NUL, false },    // OP_DELETE
+  { 'y',    NUL, false },    // OP_YANK
+  { 'c',    NUL, false },    // OP_CHANGE
+  { '<',    NUL, true },     // OP_LSHIFT
+  { '>',    NUL, true },     // OP_RSHIFT
+  { '!',    NUL, true },     // OP_FILTER
+  { 'g',    '~', false },    // OP_TILDE
+  { '=',    NUL, true },     // OP_INDENT
+  { 'g',    'q', true },     // OP_FORMAT
+  { ':',    NUL, true },     // OP_COLON
+  { 'g',    'U', false },    // OP_UPPER
+  { 'g',    'u', false },    // OP_LOWER
+  { 'J',    NUL, true },     // DO_JOIN
+  { 'g',    'J', true },     // DO_JOIN_NS
+  { 'g',    '?', false },    // OP_ROT13
+  { 'r',    NUL, false },    // OP_REPLACE
+  { 'I',    NUL, false },    // OP_INSERT
+  { 'A',    NUL, false },    // OP_APPEND
+  { 'z',    'f', true },     // OP_FOLD
+  { 'z',    'o', true },     // OP_FOLDOPEN
+  { 'z',    'O', true },     // OP_FOLDOPENREC
+  { 'z',    'c', true },     // OP_FOLDCLOSE
+  { 'z',    'C', true },     // OP_FOLDCLOSEREC
+  { 'z',    'd', true },     // OP_FOLDDEL
+  { 'z',    'D', true },     // OP_FOLDDELREC
+  { 'g',    'w', true },     // OP_FORMAT2
+  { 'g',    '@', false },    // OP_FUNCTION
+  { Ctrl_A, NUL, false },    // OP_NR_ADD
+  { Ctrl_X, NUL, false },    // OP_NR_SUB
 };
 
 /*
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index 81783232c5..f33e87572f 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -35,37 +35,35 @@ typedef int (*Indenter)(void);
 #define PLUS_REGISTER 38
 #define NUM_REGISTERS 39
 
-/*
- * Operator IDs; The order must correspond to opchars[] in ops.c!
- */
-#define OP_NOP          0       /* no pending operation */
-#define OP_DELETE       1       /* "d"  delete operator */
-#define OP_YANK         2       /* "y"  yank operator */
-#define OP_CHANGE       3       /* "c"  change operator */
-#define OP_LSHIFT       4       /* "<"  left shift operator */
-#define OP_RSHIFT       5       /* ">"  right shift operator */
-#define OP_FILTER       6       /* "!"  filter operator */
-#define OP_TILDE        7       /* "g~" switch case operator */
-#define OP_INDENT       8       /* "="  indent operator */
-#define OP_FORMAT       9       /* "gq" format operator */
-#define OP_COLON        10      /* ":"  colon operator */
-#define OP_UPPER        11      /* "gU" make upper case operator */
-#define OP_LOWER        12      /* "gu" make lower case operator */
-#define OP_JOIN         13      /* "J"  join operator, only for Visual mode */
-#define OP_JOIN_NS      14      /* "gJ"  join operator, only for Visual mode */
-#define OP_ROT13        15      /* "g?" rot-13 encoding */
-#define OP_REPLACE      16      /* "r"  replace chars, only for Visual mode */
-#define OP_INSERT       17      /* "I"  Insert column, only for Visual mode */
-#define OP_APPEND       18      /* "A"  Append column, only for Visual mode */
-#define OP_FOLD         19      /* "zf" define a fold */
-#define OP_FOLDOPEN     20      /* "zo" open folds */
-#define OP_FOLDOPENREC  21      /* "zO" open folds recursively */
-#define OP_FOLDCLOSE    22      /* "zc" close folds */
-#define OP_FOLDCLOSEREC 23      /* "zC" close folds recursively */
-#define OP_FOLDDEL      24      /* "zd" delete folds */
-#define OP_FOLDDELREC   25      /* "zD" delete folds recursively */
-#define OP_FORMAT2      26      /* "gw" format operator, keeps cursor pos */
-#define OP_FUNCTION     27      /* "g@" call 'operatorfunc' */
+// Operator IDs; The order must correspond to opchars[] in ops.c!
+#define OP_NOP          0       // no pending operation
+#define OP_DELETE       1       // "d"  delete operator
+#define OP_YANK         2       // "y"  yank operator
+#define OP_CHANGE       3       // "c"  change operator
+#define OP_LSHIFT       4       // "<"  left shift operator
+#define OP_RSHIFT       5       // ">"  right shift operator
+#define OP_FILTER       6       // "!"  filter operator
+#define OP_TILDE        7       // "g~" switch case operator
+#define OP_INDENT       8       // "="  indent operator
+#define OP_FORMAT       9       // "gq" format operator
+#define OP_COLON        10      // ":"  colon operator
+#define OP_UPPER        11      // "gU" make upper case operator
+#define OP_LOWER        12      // "gu" make lower case operator
+#define OP_JOIN         13      // "J"  join operator, only for Visual mode
+#define OP_JOIN_NS      14      // "gJ"  join operator, only for Visual mode
+#define OP_ROT13        15      // "g?" rot-13 encoding
+#define OP_REPLACE      16      // "r"  replace chars, only for Visual mode
+#define OP_INSERT       17      // "I"  Insert column, only for Visual mode
+#define OP_APPEND       18      // "A"  Append column, only for Visual mode
+#define OP_FOLD         19      // "zf" define a fold
+#define OP_FOLDOPEN     20      // "zo" open folds
+#define OP_FOLDOPENREC  21      // "zO" open folds recursively
+#define OP_FOLDCLOSE    22      // "zc" close folds
+#define OP_FOLDCLOSEREC 23      // "zC" close folds recursively
+#define OP_FOLDDEL      24      // "zd" delete folds
+#define OP_FOLDDELREC   25      // "zD" delete folds recursively
+#define OP_FORMAT2      26      // "gw" format operator, keeps cursor pos
+#define OP_FUNCTION     27      // "g@" call 'operatorfunc'
 #define OP_NR_ADD       28      // "<C-A>" Add to the number or alphabetic
                                 // character (OP_ADD conflicts with Perl)
 #define OP_NR_SUB       29      // "<C-X>" Subtract from the number or