refactor(uncrustify): improved formatting rules

src/nvim/api/private/dispatch.h

@@ -3,10 +3,7 @@
 
 #include "nvim/api/private/defs.h"
 
-typedef Object (*ApiDispatchWrapper)(uint64_t channel_id,
+typedef Object (*ApiDispatchWrapper)(uint64_t channel_id, Array args, Arena *arena, Error *error);
-                                     Array args,
-                                     Arena *arena,
-                                     Error *error);
 
 /// The rpc_method_handlers table, used in msgpack_rpc_dispatch(), stores
 /// functions of this type.

src/nvim/api/ui_events.in.h

@@ -69,11 +69,10 @@ void scroll(Integer count)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 
 // Second revision of the grid protocol, used with ext_linegrid ui option
-void default_colors_set(Integer rgb_fg, Integer rgb_bg, Integer rgb_sp,
+void default_colors_set(Integer rgb_fg, Integer rgb_bg, Integer rgb_sp, Integer cterm_fg,
-                        Integer cterm_fg, Integer cterm_bg)
+                        Integer cterm_bg)
   FUNC_API_SINCE(4) FUNC_API_REMOTE_IMPL;
-void hl_attr_define(Integer id, HlAttrs rgb_attrs, HlAttrs cterm_attrs,
+void hl_attr_define(Integer id, HlAttrs rgb_attrs, HlAttrs cterm_attrs, Array info)
-                    Array info)
   FUNC_API_SINCE(5) FUNC_API_REMOTE_IMPL FUNC_API_BRIDGE_IMPL;
 void hl_group_set(String name, Integer id)
   FUNC_API_SINCE(6) FUNC_API_BRIDGE_IMPL;
@@ -85,8 +84,8 @@ void grid_cursor_goto(Integer grid, Integer row, Integer col)
   FUNC_API_SINCE(5) FUNC_API_REMOTE_IMPL FUNC_API_COMPOSITOR_IMPL;
 void grid_line(Integer grid, Integer row, Integer col_start, Array data)
   FUNC_API_SINCE(5) FUNC_API_REMOTE_ONLY FUNC_API_CLIENT_IMPL;
-void grid_scroll(Integer grid, Integer top, Integer bot,
+void grid_scroll(Integer grid, Integer top, Integer bot, Integer left, Integer right, Integer rows,
-                 Integer left, Integer right, Integer rows, Integer cols)
+                 Integer cols)
   FUNC_API_SINCE(5) FUNC_API_REMOTE_IMPL FUNC_API_COMPOSITOR_IMPL;
 void grid_destroy(Integer grid)
   FUNC_API_SINCE(6) FUNC_API_REMOTE_ONLY;
@@ -94,20 +93,18 @@ void grid_destroy(Integer grid)
 // For performance and simplicity, we use the dense screen representation
 // in internal code, such as compositor and TUI. The remote_ui module will
 // translate this in to the public grid_line format.
-void raw_line(Integer grid, Integer row, Integer startcol,
+void raw_line(Integer grid, Integer row, Integer startcol, Integer endcol, Integer clearcol,
-              Integer endcol, Integer clearcol, Integer clearattr,
+              Integer clearattr, LineFlags flags, const schar_T *chunk, const sattr_T *attrs)
-              LineFlags flags, const schar_T *chunk, const sattr_T *attrs)
   FUNC_API_NOEXPORT FUNC_API_COMPOSITOR_IMPL;
 
 void event(char *name, Array args)
   FUNC_API_NOEXPORT FUNC_API_COMPOSITOR_IMPL;
 
-void win_pos(Integer grid, Window win, Integer startrow,
+void win_pos(Integer grid, Window win, Integer startrow, Integer startcol, Integer width,
-             Integer startcol, Integer width, Integer height)
+             Integer height)
   FUNC_API_SINCE(6) FUNC_API_REMOTE_ONLY;
-void win_float_pos(Integer grid, Window win, String anchor, Integer anchor_grid,
+void win_float_pos(Integer grid, Window win, String anchor, Integer anchor_grid, Float anchor_row,
-                   Float anchor_row, Float anchor_col, Boolean focusable,
+                   Float anchor_col, Boolean focusable, Integer zindex)
-                   Integer zindex)
   FUNC_API_SINCE(6) FUNC_API_REMOTE_ONLY;
 void win_external_pos(Integer grid, Window win)
   FUNC_API_SINCE(6) FUNC_API_REMOTE_ONLY;
@@ -118,29 +115,25 @@ void win_close(Integer grid)
 void msg_set_pos(Integer grid, Integer row, Boolean scrolled, String sep_char)
   FUNC_API_SINCE(6) FUNC_API_BRIDGE_IMPL FUNC_API_COMPOSITOR_IMPL;
 
-void win_viewport(Integer grid, Window win, Integer topline,
+void win_viewport(Integer grid, Window win, Integer topline, Integer botline, Integer curline,
-                  Integer botline, Integer curline, Integer curcol,
+                  Integer curcol, Integer line_count)
-                  Integer line_count)
   FUNC_API_SINCE(7) FUNC_API_BRIDGE_IMPL;
 
-void win_extmark(Integer grid, Window win, Integer ns_id, Integer mark_id,
+void win_extmark(Integer grid, Window win, Integer ns_id, Integer mark_id, Integer row, Integer col)
-                 Integer row, Integer col)
   FUNC_API_SINCE(10) FUNC_API_REMOTE_ONLY;
 
-void popupmenu_show(Array items, Integer selected,
+void popupmenu_show(Array items, Integer selected, Integer row, Integer col, Integer grid)
-                    Integer row, Integer col, Integer grid)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 void popupmenu_hide(void)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 void popupmenu_select(Integer selected)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 
-void tabline_update(Tabpage current, Array tabs,
+void tabline_update(Tabpage current, Array tabs, Buffer current_buffer, Array buffers)
-                    Buffer current_buffer, Array buffers)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 
-void cmdline_show(Array content, Integer pos, String firstc, String prompt,
+void cmdline_show(Array content, Integer pos, String firstc, String prompt, Integer indent,
-                  Integer indent, Integer level)
+                  Integer level)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
 void cmdline_pos(Integer pos, Integer level)
   FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;

src/nvim/edit.c

@@ -439,8 +439,7 @@ static int insert_check(VimState *state)
     s->mincol = curwin->w_wcol;
     validate_cursor_col();
 
-    if (
+    if (curwin->w_wcol < s->mincol - tabstop_at(get_nolist_virtcol(),
-        curwin->w_wcol < s->mincol - tabstop_at(get_nolist_virtcol(),
                                                 curbuf->b_p_ts,
                                                 curbuf->b_p_vts_array)
         && curwin->w_wrow == curwin->w_winrow

src/nvim/eval/typval.h

@@ -43,10 +43,8 @@ static inline ListLog *list_log_new(const size_t size)
   return ret;
 }
 
-static inline void list_log(const list_T *const l,
+static inline void list_log(const list_T *const l, const listitem_T *const li1,
-                            const listitem_T *const li1,
+                            const listitem_T *const li2, const char *const action)
-                            const listitem_T *const li2,
-                            const char *const action)
   REAL_FATTR_ALWAYS_INLINE;
 
 /// Add new entry to log
@@ -488,8 +486,7 @@ extern bool tv_in_free_unref_items;
     } \
   })
 
-static inline bool tv_get_float_chk(const typval_T *tv,
+static inline bool tv_get_float_chk(const typval_T *tv, float_T *ret_f)
-                                    float_T *ret_f)
   REAL_FATTR_NONNULL_ALL REAL_FATTR_WARN_UNUSED_RESULT;
 
 /// Get the float value

src/nvim/event/stream.h

@@ -16,8 +16,7 @@ typedef struct stream Stream;
 /// @param count Number of bytes that was read.
 /// @param data User-defined data
 /// @param eof If the stream reached EOF.
-typedef void (*stream_read_cb)(Stream *stream, RBuffer *buf, size_t count,
+typedef void (*stream_read_cb)(Stream *stream, RBuffer *buf, size_t count, void *data, bool eof);
-                               void *data, bool eof);
 
 /// Type of function called when the Stream has information about a write
 /// request.

src/nvim/file_search.c

@@ -1413,8 +1413,7 @@ char_u *find_file_in_path_option(char_u *ptr, size_t len, int options, int first
         // When the file doesn't exist, try adding parts of 'suffixesadd'.
         buf = (char *)suffixes;
         for (;;) {
-          if (
+          if ((os_path_exists(NameBuff)
-              (os_path_exists(NameBuff)
                && (find_what == FINDFILE_BOTH
                    || ((find_what == FINDFILE_DIR)
                        == os_isdir(NameBuff))))) {

src/nvim/normal.c

@@ -6518,8 +6518,7 @@ static void n_opencmd(cmdarg_T *cap)
     if (u_save((linenr_T)(curwin->w_cursor.lnum -
                           (cap->cmdchar == 'O' ? 1 : 0)),
                (linenr_T)(curwin->w_cursor.lnum +
-                          (cap->cmdchar == 'o' ? 1 : 0))
+                          (cap->cmdchar == 'o' ? 1 : 0)))
-               )
         && open_line(cap->cmdchar == 'O' ? BACKWARD : FORWARD,
                      has_format_option(FO_OPEN_COMS) ? OPENLINE_DO_COM : 0,
                      0, NULL)) {

src/nvim/tag.c

@@ -252,8 +252,7 @@ void do_tag(char *tag, int type, int count, int forceit, int verbose)
 
       new_tag = true;
     } else {
-      if (
+      if (g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
-          g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
           tagstacklen == 0) {
         // empty stack
         emsg(_(e_tagstack));

src/uncrustify.cfg

@@ -1714,7 +1714,7 @@ nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
+nl_for_brace                    = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
@@ -1738,7 +1738,7 @@ nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 nl_brace_fparen                 = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
+nl_while_brace                  = remove   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
 nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
@@ -1763,7 +1763,7 @@ nl_do_brace                     = remove   # ignore/add/remove/force/not_defined
 nl_brace_while                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
+nl_switch_brace                 = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
 nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
@@ -1777,7 +1777,7 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
+nl_multi_line_sparen_open       = remove   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
@@ -1908,7 +1908,7 @@ nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between a function name and the opening '(' in the
 # definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
+nl_func_def_paren               = remove   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
 nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
@@ -1941,7 +1941,7 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
+nl_func_decl_args               = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
 nl_func_def_args                = remove   # ignore/add/remove/force/not_defined
@@ -1958,7 +1958,7 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
+nl_func_decl_end                = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
 nl_func_def_end                 = remove   # ignore/add/remove/force/not_defined
@@ -1991,7 +1991,7 @@ nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 nl_func_call_start              = remove   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
+nl_func_call_end                = remove   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -3515,5 +3515,5 @@ set QUESTION                     REAL_FATTR_CONST
 set QUESTION                     REAL_FATTR_NONNULL_ALL
 set QUESTION                     REAL_FATTR_PURE
 set QUESTION                     REAL_FATTR_WARN_UNUSED_RESULT
-# option(s) with 'not default' value: 102
+# option(s) with 'not default' value: 110
 #