kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: bump uncrustify version

Browse Source 
Biggest change is that uncrustify is silent during linting.
This commit is contained in:
dundargoc 2023-11-16 10:59:11 +01:00 committed by dundargoc
parent de28a0f84c
commit 1798a4b5e9
8 changed files with 88 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -284,8 +284,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
endif()
ExternalProject_Add(uncrustify
URL https://github.com/uncrustify/uncrustify/archive/uncrustify-0.77.1.tar.gz
URL_HASH SHA256=414bbc9f7860eb18a53074f9af14ed04638a633b2216a73f2629291300d37c1b
URL https://github.com/uncrustify/uncrustify/archive/7edc1c53c5278206da1cef8714fdc7bd9d903137.tar.gz
URL_HASH SHA256=65cf56f482373fd3cb88ad35426465e09739bbe4262271a3a79b59e4dab2a407
DOWNLOAD_NO_PROGRESS TRUE
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/uncrustify
CMAKE_ARGS ${DEPS_CMAKE_ARGS}

4
src/nvim/fileio.c
View File

@ -2973,8 +2973,8 @@ int buf_check_timestamp(buf_T *buf)
// checked out of CVS). Always warn when the buffer was
// changed.
if (reason[2] == 'n') {
mesg = _(
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
mesg =
_("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
mesg2 = _("See \":help W12\" for more info.");
} else if (reason[1] == 'h') {
mesg = _("W11: Warning: File \"%s\" has changed since editing started");

3
src/nvim/lua/executor.c
View File

@ -474,7 +474,8 @@ static int nlua_wait(lua_State *lstate)
(int)timeout,
got_int || (is_function ? nlua_wait_condition(lstate,
&pcall_status,
&callback_result) : false));
&callback_result) :
false));
// Stop dummy timer
time_watcher_stop(tw);

3
src/nvim/mark.c
View File

@ -1062,7 +1062,8 @@ void ex_changes(exarg_T *eap)
}
snprintf(IObuff, IOSIZE, "%c %3d %5" PRIdLINENR " %4d ",
i == curwin->w_changelistidx ? '>' : ' ',
i > curwin->w_changelistidx ? i - curwin->w_changelistidx : curwin->w_changelistidx - i,
i >
curwin->w_changelistidx ? i - curwin->w_changelistidx : curwin->w_changelistidx - i,
curbuf->b_changelist[i].mark.lnum,
curbuf->b_changelist[i].mark.col);
msg_outtrans(IObuff, 0);

2
src/nvim/regexp.c
View File

@ -14162,7 +14162,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
#ifdef REGEXP_DEBUG
nfa_set_code(skip->c);
fprintf(log_fd,
"> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n", // NOLINT(whitespace/line_length)
"> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n",
abs(skip->id), skip_lid, skip->c, code);
#endif
break;

3
src/nvim/testing.c
View File

@ -42,7 +42,8 @@ typedef enum {
#endif
static const char e_assert_fails_second_arg[]
= N_("E856: \"assert_fails()\" second argument must be a string or a list with one or two strings");
= N_(
"E856: \"assert_fails()\" second argument must be a string or a list with one or two strings");
static const char e_assert_fails_fourth_argument[]
= N_("E1115: \"assert_fails()\" fourth argument must be a number");
static const char e_assert_fails_fifth_argument[]

7
src/nvim/tui/tui.c
View File

@ -2226,8 +2226,11 @@ static void augment_terminfo(TUIData *tui, const char *term, int vte_version, in
"\x1b[?2004l");
// For urxvt send BOTH xterm and old urxvt sequences. #8695
tui->unibi_ext.enable_focus_reporting = (int)unibi_add_ext_str(ut, "ext.enable_focus",
rxvt ? "\x1b[?1004h\x1b]777;focus;on\x7" : "\x1b[?1004h");
tui->unibi_ext.disable_focus_reporting = (int)unibi_add_ext_str(ut, "ext.disable_focus",
rxvt ?
"\x1b[?1004h\x1b]777;focus;on\x7" :
"\x1b[?1004h");
tui->unibi_ext.disable_focus_reporting =
(int)unibi_add_ext_str(ut, "ext.disable_focus",
rxvt ? "\x1b[?1004l\x1b]777;focus;off\x7" : "\x1b[?1004l");
tui->unibi_ext.enable_mouse = (int)unibi_add_ext_str(ut, "ext.enable_mouse",
"\x1b[?1002h\x1b[?1006h");

74
src/uncrustify.cfg
View File

@ -1,4 +1,4 @@
# Uncrustify-0.77.1_f
# Uncrustify-0.78.0_f
#
# General options
@ -99,6 +99,12 @@ sp_cpp_lambda_square_paren = ignore # ignore/add/remove/force/not_defined
# no argument list is present, as in '[] <here> { ... }'.
sp_cpp_lambda_square_brace = ignore # ignore/add/remove/force/not_defined
# Add or remove space after the opening parenthesis and before the closing
# parenthesis of a argument list of a C++11 lambda, as in
# '[]( <here> ){ ... }'
# with an empty list.
sp_cpp_lambda_argument_list_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove space after the opening parenthesis and before the closing
# parenthesis of a argument list of a C++11 lambda, as in
# '[]( <here> int x <here> ){ ... }'.
@ -195,6 +201,25 @@ sp_before_ptr_star = force # ignore/add/remove/force/not_defined
# variable name. If set to ignore, sp_before_ptr_star is used instead.
sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space before pointer star '*' that is followed by a qualifier.
# If set to ignore, sp_before_unnamed_ptr_star is used instead.
sp_before_qualifier_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
# If set to ignore, sp_before_unnamed_ptr_star is used instead.
sp_before_operator_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space before pointer star '*' that is followed by
# a class scope (as in 'int *MyClass::method()') or namespace scope
# (as in 'int *my_ns::func()').
# If set to ignore, sp_before_unnamed_ptr_star is used instead.
sp_before_scope_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space before pointer star '*' that is followed by '::',
# as in 'int *::func()'.
# If set to ignore, sp_before_unnamed_ptr_star is used instead.
sp_before_global_scope_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space between a qualifier and a pointer star '*' that isn't
# followed by a variable name, as in '(char const *)'. If set to ignore,
# sp_before_ptr_star is used instead.
@ -203,6 +228,9 @@ sp_qualifier_unnamed_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space between pointer stars '*', as in 'int ***a;'.
sp_between_ptr_star = ignore # ignore/add/remove/force/not_defined
# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
sp_between_ptr_ref = ignore # ignore/add/remove/force/not_defined
# Add or remove space after pointer star '*', if followed by a word.
#
# Overrides sp_type_func.
@ -313,6 +341,7 @@ sp_before_angle = ignore # ignore/add/remove/force/not_defined
sp_inside_angle = ignore # ignore/add/remove/force/not_defined
# Add or remove space inside '<>'.
# if empty.
sp_inside_angle_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove space between '>' and ':'.
@ -449,6 +478,7 @@ sp_cpp_before_struct_binding = ignore # ignore/add/remove/force/not_defined
sp_inside_square = remove # ignore/add/remove/force/not_defined
# Add or remove space inside '[]'.
# if empty.
sp_inside_square_empty = ignore # ignore/add/remove/force/not_defined
# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
@ -607,6 +637,7 @@ sp_inside_type_brace_init_lst = ignore # ignore/add/remove/force/not_defined
sp_inside_braces = add # ignore/add/remove/force/not_defined
# Add or remove space inside '{}'.
# if empty.
sp_inside_braces_empty = remove # ignore/add/remove/force/not_defined
# Add or remove space around trailing return operator '->'.
@ -624,7 +655,7 @@ sp_type_brace_init_lst = ignore # ignore/add/remove/force/not_defined
sp_func_proto_paren = remove # ignore/add/remove/force/not_defined
# Add or remove space between function name and '()' on function declaration
# without parameters.
# if empty.
sp_func_proto_paren_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove space between function name and '(' with a typedef specifier.
@ -634,7 +665,7 @@ sp_func_type_paren = ignore # ignore/add/remove/force/not_defined
sp_func_def_paren = remove # ignore/add/remove/force/not_defined
# Add or remove space between function name and '()' on function definition
# without parameters.
# if empty.
sp_func_def_paren_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove space inside empty function '()'.
@ -1083,6 +1114,12 @@ sp_after_noexcept = ignore # ignore/add/remove/force/not_defined
# Add or remove space after '_'.
sp_vala_after_translation = ignore # ignore/add/remove/force/not_defined
# Add or remove space before a bit colon ':'.
sp_before_bit_colon = ignore # ignore/add/remove/force/not_defined
# Add or remove space after a bit colon ':'.
sp_after_bit_colon = ignore # ignore/add/remove/force/not_defined
# If true, a <TAB> is inserted after #define.
force_tab_after_define = false # true/false
@ -2313,8 +2350,21 @@ nl_after_func_class_proto_group = 0 # unsigned number
nl_class_leave_one_liner_groups = false # true/false
# The number of newlines after '}' of a multi-line function body.
#
# Overrides nl_min_after_func_body and nl_max_after_func_body.
nl_after_func_body = 0 # unsigned number
# The minimum number of newlines after '}' of a multi-line function body.
#
# Only works when nl_after_func_body is 0.
nl_min_after_func_body = 0 # unsigned number
# The maximum number of newlines after '}' of a multi-line function body.
#
# Only works when nl_after_func_body is 0.
# Takes precedence over nl_min_after_func_body.
nl_max_after_func_body = 0 # unsigned number
# The number of newlines after '}' of a multi-line function body in a class
# declaration. Also affects class constructors/destructors.
#
@ -2818,6 +2868,13 @@ align_right_cmt_at_col = 0 # unsigned number
# 0: Don't align (default).
align_func_proto_span = 0 # unsigned number
# Whether to ignore continuation lines when evaluating the number of
# new lines for the function prototype alignment's span.
#
# false: continuation lines are part of the newlines count
# true: continuation lines are not counted
align_func_proto_span_ignore_cont_lines = false # true/false
# How to consider (or treat) the '*' in the alignment of function prototypes.
#
# 0: Part of the type 'void * foo();' (default)
@ -2878,6 +2935,12 @@ align_oc_msg_spec_span = 0 # unsigned number
# 3: Align with the backslash that is farthest to the right
align_nl_cont = 0 # unsigned number
# The minimum number of spaces between the end of a line and its continuation
# backslash. Requires align_nl_cont.
#
# Default: 1
align_nl_cont_spaces = 1 # unsigned number
# Whether to align macro functions and variables together.
align_pp_define_together = false # true/false
@ -3581,6 +3644,11 @@ debug_sort_the_tracks = true # true/false
# only if the -p option is set.
debug_decode_the_flags = false # true/false
# use (or not) the exit(EX_SOFTWARE) function.
#
# Default: true
debug_use_the_exit_function_pop = true # true/false
# insert the number of the line at the beginning of each line
set_numbering_for_html_output = false # true/false