refactor: saner options for uncrustify #16196

* refactor: general good option changes
  sp_deref = remove
  sp_not = remove
  sp_inv = remove
  sp_inside_paren_cast = remove
  mod_remove_duplicate_include = true
  sp_after_semi = add
  sp_after_semi_for = force
  sp_sizeof_paren = remove
  nl_return_expr = remove
  nl_else_brace = remove
  nl_else_if = remove
* refactor: mod_remove_extra_semicolon = true
* refactor: nl_max = 3
* refactor: sp_bool = force
* refactor: sp_compare = force
* refactor: sp_inside_paren = remove
* refactor: sp_paren_paren = remove
* refactor: sp_inside_sparen = remove
* refactor: sp_before_sparen = force
* refactor: sp_sign = remove
* refactor: sp_addr = remove
* refactor: sp_member = remove
* refactor: nl_struct_brace = remove
* refactor: nl_before_if_closing_paren = remove
* refactor: nl_fdef_brace = force
* refactor: sp_paren_comma = force
* refactor: mod_full_brace_do = add

1 files changed, 4 insertions, 8 deletions

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 4542576339..e2884c242b 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -3329,7 +3329,7 @@ void get_complete_info(list_T *what_list, dict_T *retdict)
 // Return Insert completion mode name string
 static char_u *ins_compl_mode(void)
 {
-  if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL ||  compl_started) {
+  if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL || compl_started) {
     return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT];
   }
   return (char_u *)"";
@@ -3904,7 +3904,6 @@ static buf_T *ins_compl_next_buf(buf_T *buf, int flag)
     assert(wp);
     while ((wp = (wp->w_next != NULL ? wp->w_next : firstwin)) != curwin
            && wp->w_buffer->b_scanned) {
-      ;
     }
     buf = wp->w_buffer;
   } else {
@@ -3917,7 +3916,6 @@ static buf_T *ins_compl_next_buf(buf_T *buf, int flag)
                 : (!buf->b_p_bl
                    || (buf->b_ml.ml_mfp == NULL) != (flag == 'u')))
                || buf->b_scanned)) {
-      ;
     }
   }
   return buf;
@@ -4427,7 +4425,7 @@ static int ins_compl_get_exp(pos_T *ini)
         // when ADDING, the text before the cursor matches, skip it
         if ((compl_cont_status & CONT_ADDING) && ins_buf == curbuf
             && ini->lnum == pos->lnum
-            && ini->col  == pos->col) {
+            && ini->col == pos->col) {
           continue;
         }
         ptr = ml_get_buf(ins_buf, pos->lnum, false) + pos->col;
@@ -5100,7 +5098,6 @@ static int ins_complete(int c, bool enable_pum)
           || ctrl_x_mode == CTRL_X_PATH_DEFINES) {
         if (!(compl_cont_status & CONT_ADDING)) {
           while (--startcol >= 0 && vim_isIDc(line[startcol])) {
-            ;
           }
           compl_col += ++startcol;
           compl_length = curs_col - startcol;
@@ -5788,7 +5785,6 @@ void insertchar(int c, int flags, int second_indent)
       // Skip white space before the cursor
       i = curwin->w_cursor.col;
       while (--i >= 0 && ascii_iswhite(line[i])) {
-        ;
       }
       i++;
 
@@ -7373,7 +7369,8 @@ void fixthisline(IndentGetter get_the_indent)
   }
 }
 
-void fix_indent(void) {
+void fix_indent(void)
+{
   if (p_paste) {
     return;
   }
@@ -8582,7 +8579,6 @@ static void ins_mousescroll(int dir)
 }
 
 
-
 static void ins_left(void)
 {
   pos_T tpos;