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

4 files changed, 7 insertions, 8 deletions

diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c
index e6756315c6..6f1fb15dac 100644
--- a/src/nvim/api/extmark.c
+++ b/src/nvim/api/extmark.c
@@ -94,7 +94,6 @@ static bool ns_initialized(uint64_t ns)
 }
 
 
-
 static Array extmark_to_array(ExtmarkInfo extmark, bool id, bool add_dict)
 {
   Array rv = ARRAY_DICT_INIT;
@@ -504,7 +503,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer
   }
 
 #define OPTION_TO_BOOL(target, name, val) \
-  target = api_object_to_bool(opts-> name, #name, val, err); \
+  target = api_object_to_bool(opts->name, #name, val, err); \
   if (ERROR_SET(err)) { \
     goto error; \
   }
diff --git a/src/nvim/api/private/converter.c b/src/nvim/api/private/converter.c
index 0d054c7958..36da6c13a9 100644
--- a/src/nvim/api/private/converter.c
+++ b/src/nvim/api/private/converter.c
@@ -5,10 +5,10 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "nvim/assert.h"
+#include "nvim/api/private/converter.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
-#include "nvim/api/private/converter.h"
+#include "nvim/assert.h"
 #include "nvim/eval/typval.h"
 
 /// Helper structure for vim_to_object
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 6b3f4a29d7..d470def277 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "nvim/api/private/converter.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/vim.h"
@@ -28,7 +29,6 @@
 #include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/api/private/converter.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/option.h"
 #include "nvim/option_defs.h"
@@ -607,7 +607,7 @@ void modify_keymap(Buffer buffer, bool is_unmap, String mode, String lhs, String
   MapArguments parsed_args = MAP_ARGUMENTS_INIT;
   if (opts) {
 #define KEY_TO_BOOL(name) \
-  parsed_args. name = api_object_to_bool(opts-> name, #name, false, err); \
+  parsed_args.name = api_object_to_bool(opts->name, #name, false, err); \
   if (ERROR_SET(err)) { \
     goto fail_and_free; \
   }
diff --git a/src/nvim/api/vimscript.c b/src/nvim/api/vimscript.c
index ac68b0eb91..c516cedaf4 100644
--- a/src/nvim/api/vimscript.c
+++ b/src/nvim/api/vimscript.c
@@ -5,11 +5,11 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "nvim/ascii.h"
-#include "nvim/api/vimscript.h"
 #include "nvim/api/private/converter.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
+#include "nvim/api/vimscript.h"
+#include "nvim/ascii.h"
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"