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

This commit is contained in:
Andrei Astafev 2019-10-21 18:58:33 +03:00
commit c312b3c2e5

View File

@ -1349,7 +1349,7 @@ nl_after_square_assign = ignore # ignore/add/remove/force
nl_fcall_brace = add # ignore/add/remove/force
# 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'.
nl_enum_class = ignore # ignore/add/remove/force
@ -1364,10 +1364,10 @@ nl_enum_identifier_colon = ignore # ignore/add/remove/force
nl_enum_colon_type = ignore # ignore/add/remove/force
# 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 '{'.
nl_union_brace = ignore # ignore/add/remove/force
nl_union_brace = force # ignore/add/remove/force
# Add or remove newline between 'if' and '{'.
nl_if_brace = add # ignore/add/remove/force
@ -1988,6 +1988,15 @@ nl_between_get_set = 0 # unsigned number
# (C#) Add or remove newline between property and the '{'.
nl_property_brace = ignore # ignore/add/remove/force
# The number of newlines after '{' of a namespace. This also adds newlines
# before the matching '}'.
#
# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
# applicable, otherwise no change.
#
# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
nl_inside_namespace = 2 # unsigned number
# Whether to remove blank lines after '{'.
eat_blanks_after_open_brace = true # true/false
@ -2572,27 +2581,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
@ -2856,5 +2865,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number
# `macro-close END_MESSAGE_MAP`
#
#
# option(s) with 'not default' value: 111
# option(s) with 'not default' value: 114
#