Merge branch 'master' of git.246060.ru:f1x1t/uncrustify

This commit is contained in:
Andrei Astafev 2019-10-02 14:20:48 +03:00
commit 0293201df9

View File

@ -97,6 +97,10 @@ sp_cpp_lambda_square_brace = ignore # ignore/add/remove/force
# '[](int x) <here> { ... }'. # '[](int x) <here> { ... }'.
sp_cpp_lambda_paren_brace = ignore # ignore/add/remove/force sp_cpp_lambda_paren_brace = ignore # ignore/add/remove/force
# Add or remove space between a lambda body and its call operator of an
# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
sp_cpp_lambda_fparen = ignore # ignore/add/remove/force
# Add or remove space around assignment operator '=' in a prototype. # Add or remove space around assignment operator '=' in a prototype.
# #
# If set to ignore, use sp_assign. # If set to ignore, use sp_assign.
@ -172,13 +176,15 @@ sp_brace_brace = force # ignore/add/remove/force
sp_before_ptr_star = remove # ignore/add/remove/force sp_before_ptr_star = remove # ignore/add/remove/force
# Add or remove space before pointer star '*' that isn't followed by a # Add or remove space before pointer star '*' that isn't followed by a
# variable name. If set to 'ignore', sp_before_ptr_star is used instead. # variable name. If set to ignore, sp_before_ptr_star is used instead.
sp_before_unnamed_ptr_star = remove # ignore/add/remove/force sp_before_unnamed_ptr_star = remove # ignore/add/remove/force
# Add or remove space between pointer stars '*'. # Add or remove space between pointer stars '*'.
sp_between_ptr_star = remove # ignore/add/remove/force sp_between_ptr_star = remove # ignore/add/remove/force
# Add or remove space after pointer star '*', if followed by a word. # Add or remove space after pointer star '*', if followed by a word.
#
# Overrides sp_type_func.
sp_after_ptr_star = add # ignore/add/remove/force sp_after_ptr_star = add # ignore/add/remove/force
# Add or remove space after pointer caret '^', if followed by a word. # Add or remove space after pointer caret '^', if followed by a word.
@ -189,6 +195,8 @@ sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force
# Add or remove space after a pointer star '*', if followed by a function # Add or remove space after a pointer star '*', if followed by a function
# prototype or function definition. # prototype or function definition.
#
# Overrides sp_after_ptr_star and sp_type_func.
sp_after_ptr_star_func = ignore # ignore/add/remove/force sp_after_ptr_star_func = ignore # ignore/add/remove/force
# Add or remove space after a pointer star '*', if followed by an open # Add or remove space after a pointer star '*', if followed by an open
@ -203,14 +211,18 @@ sp_before_ptr_star_func = remove # ignore/add/remove/force
sp_before_byref = remove # ignore/add/remove/force sp_before_byref = remove # ignore/add/remove/force
# Add or remove space before a reference sign '&' that isn't followed by a # Add or remove space before a reference sign '&' that isn't followed by a
# variable name. If set to 'ignore', sp_before_byref is used instead. # variable name. If set to ignore, sp_before_byref is used instead.
sp_before_unnamed_byref = ignore # ignore/add/remove/force sp_before_unnamed_byref = ignore # ignore/add/remove/force
# Add or remove space after reference sign '&', if followed by a word. # Add or remove space after reference sign '&', if followed by a word.
#
# Overrides sp_type_func.
sp_after_byref = add # ignore/add/remove/force sp_after_byref = add # ignore/add/remove/force
# Add or remove space after a reference sign '&', if followed by a function # Add or remove space after a reference sign '&', if followed by a function
# prototype or function definition. # prototype or function definition.
#
# Overrides sp_after_byref and sp_type_func.
sp_after_byref_func = ignore # ignore/add/remove/force sp_after_byref_func = ignore # ignore/add/remove/force
# Add or remove space before a reference sign '&', if followed by a function # Add or remove space before a reference sign '&', if followed by a function
@ -245,7 +257,7 @@ sp_inside_angle_empty = ignore # ignore/add/remove/force
# Add or remove space between '>' and ':'. # Add or remove space between '>' and ':'.
sp_angle_colon = ignore # ignore/add/remove/force sp_angle_colon = ignore # ignore/add/remove/force
# Add or remove space after '<>'. # Add or remove space after '>'.
sp_after_angle = force # ignore/add/remove/force sp_after_angle = force # ignore/add/remove/force
# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'. # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
@ -488,6 +500,7 @@ sp_func_def_paren = remove # ignore/add/remove/force
sp_func_def_paren_empty = remove # ignore/add/remove/force sp_func_def_paren_empty = remove # ignore/add/remove/force
# Add or remove space inside empty function '()'. # Add or remove space inside empty function '()'.
# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
sp_inside_fparens = remove # ignore/add/remove/force sp_inside_fparens = remove # ignore/add/remove/force
# Add or remove space inside function '(' and ')'. # Add or remove space inside function '(' and ')'.
@ -520,7 +533,7 @@ sp_fparen_dbrace = ignore # ignore/add/remove/force
sp_func_call_paren = remove # ignore/add/remove/force sp_func_call_paren = remove # ignore/add/remove/force
# Add or remove space between function name and '()' on function calls without # Add or remove space between function name and '()' on function calls without
# parameters. If set to 'ignore' (the default), sp_func_call_paren is used. # parameters. If set to ignore (the default), sp_func_call_paren is used.
sp_func_call_paren_empty = remove # ignore/add/remove/force sp_func_call_paren_empty = remove # ignore/add/remove/force
# Add or remove space between the user function name and '(' on function # Add or remove space between the user function name and '(' on function
@ -1330,7 +1343,7 @@ nl_after_square_assign = ignore # ignore/add/remove/force
nl_fcall_brace = add # ignore/add/remove/force nl_fcall_brace = add # ignore/add/remove/force
# Add or remove newline between 'enum' and '{'. # Add or remove newline between 'enum' and '{'.
nl_enum_brace = ignore # ignore/add/remove/force nl_enum_brace = force # ignore/add/remove/force
# Add or remove newline between 'enum' and 'class'. # Add or remove newline between 'enum' and 'class'.
nl_enum_class = ignore # ignore/add/remove/force nl_enum_class = ignore # ignore/add/remove/force
@ -1345,10 +1358,10 @@ nl_enum_identifier_colon = ignore # ignore/add/remove/force
nl_enum_colon_type = ignore # ignore/add/remove/force nl_enum_colon_type = ignore # ignore/add/remove/force
# Add or remove newline between 'struct and '{'. # Add or remove newline between 'struct and '{'.
nl_struct_brace = ignore # ignore/add/remove/force nl_struct_brace = force # ignore/add/remove/force
# Add or remove newline between 'union' and '{'. # Add or remove newline between 'union' and '{'.
nl_union_brace = ignore # ignore/add/remove/force nl_union_brace = force # ignore/add/remove/force
# Add or remove newline between 'if' and '{'. # Add or remove newline between 'if' and '{'.
nl_if_brace = add # ignore/add/remove/force nl_if_brace = add # ignore/add/remove/force
@ -2753,6 +2766,11 @@ use_indent_continue_only_once = false # true/false
# false: indentation will be used every time (default) # false: indentation will be used every time (default)
indent_cpp_lambda_only_once = true # true/false indent_cpp_lambda_only_once = true # true/false
# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
# historic behavior, but is probably not the desired behavior, so this is off
# by default.
use_sp_after_angle_always = false # true/false
# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially, # Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
# this tries to format these so that they match Qt's normalized form (i.e. the # this tries to format these so that they match Qt's normalized form (i.e. the
# result of QMetaObject::normalizedSignature), which can slightly improve the # result of QMetaObject::normalizedSignature), which can slightly improve the
@ -2826,5 +2844,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number
# `macro-close END_MESSAGE_MAP` # `macro-close END_MESSAGE_MAP`
# #
# #
# option(s) with 'not default' value: 111 # option(s) with 'not default' value: 114
# #