mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 14:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(uncrustify): change config to better align with style guide (#18803)

Browse Source 
refactor(uncrustify): change config to better align with neovim style
This commit is contained in:
dundargoc
2022-06-30 14:27:52 +02:00
committed by GitHub
parent 69cd0ba27b
commit cb84f5ee53
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval/funcs.c
View File

@@ -91,13 +91,11 @@ typedef enum {
# pragma function(floor) # pragma function(floor)
# endif # endif
// uncrustify:off
PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
# include "funcs.generated.h" # include "funcs.generated.h"
PRAGMA_DIAG_POP PRAGMA_DIAG_POP
PRAGMA_DIAG_POP PRAGMA_DIAG_POP
// uncrustify:on
#endif #endif
static char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob"); static char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob");

2
src/nvim/eval/typval_encode.c.h
View File

@@ -1,3 +1,5 @@
// uncrustify:off
/// @file eval/typval_encode.c.h /// @file eval/typval_encode.c.h
/// ///
/// Contains set of macros used to convert (possibly recursive) typval_T into /// Contains set of macros used to convert (possibly recursive) typval_T into

4
src/nvim/fileio.c
View File

@@ -4886,13 +4886,11 @@ int buf_check_timestamp(buf_T *buf)
char *mesg2 = ""; char *mesg2 = "";
bool helpmesg = false; bool helpmesg = false;
// uncrustify:off
enum { enum {
RELOAD_NONE, RELOAD_NONE,
RELOAD_NORMAL, RELOAD_NORMAL,
RELOAD_DETECT RELOAD_DETECT,
} reload = RELOAD_NONE; } reload = RELOAD_NONE;
// uncrustify:on
bool can_reload = false; bool can_reload = false;
uint64_t orig_size = buf->b_orig_size; uint64_t orig_size = buf->b_orig_size;

20
src/uncrustify.cfg
View File

@@ -1,4 +1,4 @@
# Uncrustify-0.75.0_f # Uncrustify-0.75.1_f
# #
# General options # General options
@@ -7,7 +7,7 @@
# The type of line endings. # The type of line endings.
# #
# Default: auto # Default: auto
newlines = auto # lf/crlf/cr/auto newlines = lf # lf/crlf/cr/auto
# The original size of tabs in the input. # The original size of tabs in the input.
# #
@@ -335,7 +335,7 @@ sp_inside_sparen = remove # ignore/add/remove/force/not_defined
# Add or remove space after '(' of control statements other than 'for'. # Add or remove space after '(' of control statements other than 'for'.
# #
# Overrides sp_inside_sparen. # Overrides sp_inside_sparen.
sp_inside_sparen_open = remove # ignore/add/remove/force/not_defined sp_inside_sparen_open = ignore # ignore/add/remove/force/not_defined
# Add or remove space before ')' of control statements other than 'for'. # Add or remove space before ')' of control statements other than 'for'.
# #
@@ -591,7 +591,7 @@ sp_inside_type_brace_init_lst = ignore # ignore/add/remove/force/not_defined
sp_inside_braces = add # ignore/add/remove/force/not_defined sp_inside_braces = add # ignore/add/remove/force/not_defined
# Add or remove space inside '{}'. # Add or remove space inside '{}'.
sp_inside_braces_empty = ignore # ignore/add/remove/force/not_defined sp_inside_braces_empty = remove # ignore/add/remove/force/not_defined
# Add or remove space around trailing return operator '->'. # Add or remove space around trailing return operator '->'.
sp_trailing_return = ignore # ignore/add/remove/force/not_defined sp_trailing_return = ignore # ignore/add/remove/force/not_defined
@@ -691,10 +691,10 @@ sp_return_paren = force # ignore/add/remove/force/not_defined
sp_return_brace = ignore # ignore/add/remove/force/not_defined sp_return_brace = ignore # ignore/add/remove/force/not_defined
# Add or remove space between '__attribute__' and '('. # Add or remove space between '__attribute__' and '('.
sp_attribute_paren = ignore # ignore/add/remove/force/not_defined sp_attribute_paren = remove # ignore/add/remove/force/not_defined
# Add or remove space between 'defined' and '(' in '#if defined (FOO)'. # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
sp_defined_paren = ignore # ignore/add/remove/force/not_defined sp_defined_paren = remove # ignore/add/remove/force/not_defined
# Add or remove space between 'throw' and '(' in 'throw (something)'. # Add or remove space between 'throw' and '(' in 'throw (something)'.
sp_throw_paren = ignore # ignore/add/remove/force/not_defined sp_throw_paren = ignore # ignore/add/remove/force/not_defined
@@ -1677,7 +1677,7 @@ nl_enum_colon_type = ignore # ignore/add/remove/force/not_defined
nl_struct_brace = remove # ignore/add/remove/force/not_defined nl_struct_brace = remove # ignore/add/remove/force/not_defined
# Add or remove newline between 'union' and '{'. # Add or remove newline between 'union' and '{'.
nl_union_brace = ignore # ignore/add/remove/force/not_defined nl_union_brace = remove # ignore/add/remove/force/not_defined
# Add or remove newline between 'if' and '{'. # Add or remove newline between 'if' and '{'.
nl_if_brace = remove # ignore/add/remove/force/not_defined nl_if_brace = remove # ignore/add/remove/force/not_defined
@@ -1921,7 +1921,7 @@ nl_func_call_paren = ignore # ignore/add/remove/force/not_defined
nl_func_call_paren_empty = ignore # ignore/add/remove/force/not_defined nl_func_call_paren_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove newline after '(' in a function declaration. # Add or remove newline after '(' in a function declaration.
nl_func_decl_start = ignore # ignore/add/remove/force/not_defined nl_func_decl_start = remove # ignore/add/remove/force/not_defined
# Add or remove newline after '(' in a function definition. # Add or remove newline after '(' in a function definition.
nl_func_def_start = remove # ignore/add/remove/force/not_defined nl_func_def_start = remove # ignore/add/remove/force/not_defined
@@ -3508,10 +3508,12 @@ set QUESTION FUNC_ATTR_PRINTF
set QUESTION FUNC_ATTR_PURE set QUESTION FUNC_ATTR_PURE
set QUESTION FUNC_ATTR_UNUSED set QUESTION FUNC_ATTR_UNUSED
set QUESTION FUNC_ATTR_WARN_UNUSED_RESULT set QUESTION FUNC_ATTR_WARN_UNUSED_RESULT
set PP_PRAGMA PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
set PP_PRAGMA PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
set QUESTION REAL_FATTR_ALWAYS_INLINE set QUESTION REAL_FATTR_ALWAYS_INLINE
set QUESTION REAL_FATTR_CONST set QUESTION REAL_FATTR_CONST
set QUESTION REAL_FATTR_NONNULL_ALL set QUESTION REAL_FATTR_NONNULL_ALL
set QUESTION REAL_FATTR_PURE set QUESTION REAL_FATTR_PURE
set QUESTION REAL_FATTR_WARN_UNUSED_RESULT set QUESTION REAL_FATTR_WARN_UNUSED_RESULT
# option(s) with 'not default' value: 97 # option(s) with 'not default' value: 102
# #