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, 9 insertions, 11 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index c3a5f8dbe6..c3e6fb816b 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -2530,13 +2530,14 @@ int findsent(Direction dir, long count)
       }
       if (c == '.' || c == '!' || c == '?') {
         tpos = pos;
-        do
+        do{
           if ((c = inc(&tpos)) == -1) {
             break;
           }
+        }
         while (vim_strchr((char_u *)")]\"'", c = gchar_pos(&tpos))
                != NULL);
-        if (c == -1  || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL
+        if (c == -1 || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL
             || (cpo_J && (c == ' ' && inc(&tpos) >= 0
                           && gchar_pos(&tpos) == ' '))) {
           pos = tpos;
@@ -2662,12 +2663,12 @@ static int inmacro(char_u *opt, char_u *s)
     // 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] == ' ')))) {
+    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;
@@ -4250,7 +4251,6 @@ abort_search:
 }
 
 
-
 /// Find next search match under cursor, cursor at end.
 /// Used while an operator is pending, and in Visual mode.
 ///
@@ -4934,10 +4934,8 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
               // find the file name after the end of the match
               for (p = incl_regmatch.endp[0];
                    *p && !vim_isfilec(*p); p++) {
-                ;
               }
               for (i = 0; vim_isfilec(p[i]); i++) {
-                ;
               }
             }