diff --git a/default.cfg b/default.cfg index 2d64d9a..711ef90 100644 --- a/default.cfg +++ b/default.cfg @@ -77,9 +77,6 @@ sp_arith_additive = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force -# Add or remove space around trailing return operator '->'. -sp_trailing_ret_t = force # ignore/add/remove/force - # Add or remove space around '=' in C++11 lambda capture specifications. # # Overrides sp_assign. @@ -480,6 +477,9 @@ sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}'. sp_inside_braces_empty = remove # ignore/add/remove/force +# Add or remove space around trailing return operator '->'. +sp_trailing_return = force # ignore/add/remove/force + # Add or remove space between return type and function name. A minimum of 1 # is forced except for pointer return types. sp_type_func = ignore # ignore/add/remove/force @@ -1491,9 +1491,63 @@ nl_before_throw = ignore # ignore/add/remove/force # Add or remove newline between 'namespace' and '{'. nl_namespace_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'template<>' and whatever follows. +# Add or remove newline after 'template<...>' of a template class. nl_template_class = ignore # ignore/add/remove/force +# Add or remove newline after 'template<...>' of a template class declaration. +# +# Overrides nl_template_class. +nl_template_class_decl = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<>' of a specialized class declaration. +# +# Overrides nl_template_class_decl. +nl_template_class_decl_special = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<...>' of a template class definition. +# +# Overrides nl_template_class. +nl_template_class_def = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<>' of a specialized class definition. +# +# Overrides nl_template_class_def. +nl_template_class_def_special = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<...>' of a template function. +nl_template_func = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<...>' of a template function +# declaration. +# +# Overrides nl_template_func. +nl_template_func_decl = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<>' of a specialized function +# declaration. +# +# Overrides nl_template_func_decl. +nl_template_func_decl_special = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<...>' of a template function +# definition. +# +# Overrides nl_template_func. +nl_template_func_def = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<>' of a specialized function +# definition. +# +# Overrides nl_template_func_def. +nl_template_func_def_special = ignore # ignore/add/remove/force + +# Add or remove newline after 'template<...>' of a template variable. +nl_template_var = ignore # ignore/add/remove/force + +# Add or remove newline between 'template<...>' and 'using' of a templated +# type alias. +nl_template_using = ignore # ignore/add/remove/force + # Add or remove newline between 'class' and '{'. nl_class_brace = add # ignore/add/remove/force @@ -1988,15 +2042,6 @@ 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 @@ -2050,7 +2095,7 @@ pos_class_comma = trail # ignore/break/force/lead/trail/join/ # The position of the comma in the constructor initialization list. # Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon. -pos_constr_comma = trail_force # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force +pos_constr_comma = trail_force # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force # The position of trailing/leading class colon, between class and base class # list. Affects nl_class_colon. @@ -2581,27 +2626,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 = 20 # 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 = 2 # 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 = 16 # 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 = 20 # 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 = 16 # 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 = 16 # 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 @@ -2865,5 +2910,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number # `macro-close END_MESSAGE_MAP` # # -# option(s) with 'not default' value: 114 +# option(s) with 'not default' value: 140 #