Compare commits

...

5 Commits

Author SHA1 Message Date
a81f6a48e0 update 2019-10-02 14:23:45 +03:00
c3eed90064 update 2019-10-02 14:21:51 +03:00
0293201df9 Merge branch 'master' of git.246060.ru:f1x1t/uncrustify 2019-10-02 14:20:48 +03:00
c0b239f206 update 2019-10-02 14:20:36 +03:00
e5214f32b8 Обновление 20190926 2019-09-27 07:27:06 +03:00

View File

@@ -97,6 +97,10 @@ sp_cpp_lambda_square_brace = ignore # ignore/add/remove/force
# '[](int x) <here> { ... }'.
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.
#
# If set to ignore, use sp_assign.
@@ -172,7 +176,7 @@ sp_brace_brace = force # 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
# 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
# Add or remove space between pointer stars '*'.
@@ -207,7 +211,7 @@ sp_before_ptr_star_func = 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
# 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
# Add or remove space after reference sign '&', if followed by a word.
@@ -253,7 +257,7 @@ sp_inside_angle_empty = ignore # ignore/add/remove/force
# Add or remove space between '>' and ':'.
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
# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
@@ -496,6 +500,7 @@ sp_func_def_paren = remove # ignore/add/remove/force
sp_func_def_paren_empty = remove # ignore/add/remove/force
# 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
# Add or remove space inside function '(' and ')'.
@@ -528,7 +533,7 @@ sp_fparen_dbrace = ignore # 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
# 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
# Add or remove space between the user function name and '(' on function
@@ -1969,7 +1974,7 @@ nl_property_brace = ignore # ignore/add/remove/force
# applicable, otherwise no change.
#
# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
nl_inside_namespace = 0 # unsigned number
nl_inside_namespace = 2 # unsigned number
# Whether to remove blank lines after '{'.
eat_blanks_after_open_brace = true # true/false
@@ -2555,27 +2560,27 @@ mod_remove_extra_semicolon = true # true/false
# If a function body exceeds the specified number of newlines and doesn't have
# a comment after the close brace, a comment will be added.
mod_add_long_function_closebrace_comment = 0 # unsigned number
mod_add_long_function_closebrace_comment = 20 # unsigned number
# If a namespace body exceeds the specified number of newlines and doesn't
# have a comment after the close brace, a comment will be added.
mod_add_long_namespace_closebrace_comment = 0 # unsigned number
mod_add_long_namespace_closebrace_comment = 2 # unsigned number
# If a class body exceeds the specified number of newlines and doesn't have a
# comment after the close brace, a comment will be added.
mod_add_long_class_closebrace_comment = 0 # unsigned number
mod_add_long_class_closebrace_comment = 16 # unsigned number
# If a switch body exceeds the specified number of newlines and doesn't have a
# comment after the close brace, a comment will be added.
mod_add_long_switch_closebrace_comment = 0 # unsigned number
mod_add_long_switch_closebrace_comment = 20 # unsigned number
# If an #ifdef body exceeds the specified number of newlines and doesn't have
# a comment after the #endif, a comment will be added.
mod_add_long_ifdef_endif_comment = 0 # unsigned number
mod_add_long_ifdef_endif_comment = 16 # unsigned number
# If an #ifdef or #else body exceeds the specified number of newlines and
# doesn't have a comment after the #else, a comment will be added.
mod_add_long_ifdef_else_comment = 0 # unsigned number
mod_add_long_ifdef_else_comment = 16 # unsigned number
# Whether to take care of the case by the mod_sort_xx options.
mod_sort_case_sensitive = false # true/false
@@ -2761,6 +2766,11 @@ use_indent_continue_only_once = false # true/false
# false: indentation will be used every time (default)
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,
# 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