From 2c51ecc3dc681b11a6283d8ab64e6410f8b11678 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 27 Nov 2019 20:51:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=BB=D1=8F=200.70.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.cfg | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/default.cfg b/default.cfg index eb4bd0a..b47a900 100644 --- a/default.cfg +++ b/default.cfg @@ -1,4 +1,4 @@ -# Uncrustify-0.69.0_f +# Uncrustify-0.70.1_f # # General options @@ -345,6 +345,11 @@ sp_after_semi_for_empty = add # ignore/add/remove/force # Add or remove space before '[' (except '[]'). sp_before_square = ignore # ignore/add/remove/force +# Add or remove space before '[' for a variable definition. +# +# Default: remove +sp_before_vardef_square = remove # ignore/add/remove/force + # Add or remove space before '[' for asm block. sp_before_square_asm_block = ignore # ignore/add/remove/force @@ -1087,6 +1092,16 @@ indent_func_const = 0 # unsigned number # prototype. indent_func_throw = 0 # unsigned number +# How to indent within a macro followed by a brace on the same line +# This allows reducing the indent in macros that have (for example) +# `do { ... } while (0)` blocks bracketing them. +# +# true: add an indent for the brace on the same line as the macro +# false: do not add an indent for the brace on the same line as the macro +# +# Default: true +indent_macro_brace = true # true/false + # The number of spaces to indent a continued '->' or '.'. # Usually set to 0, 1, or indent_columns. indent_member = 0 # unsigned number @@ -1105,6 +1120,9 @@ indent_relative_single_line_comments = true # true/false # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns. indent_switch_case = 0 # unsigned number +# indent 'break' with 'case' from 'switch'. +indent_switch_break_with_case = false # true/false + # Whether to indent preprocessor statements inside of switch statements. # # Default: true @@ -1311,6 +1329,7 @@ nl_getset_leave_one_liners = true # true/false nl_cs_property_leave_one_liners = false # true/false # Don't split one-line function definitions, as in 'int foo() { return 0; }'. +# night modify nl_func_type_name nl_func_leave_one_liners = false # true/false # Don't split one-line C++11 lambdas, as in '[]() { return 0; }'. @@ -1598,6 +1617,7 @@ nl_enum_own_lines = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function # definition. +# might be modified by nl_func_leave_one_liners nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class @@ -1717,6 +1737,15 @@ nl_func_call_args_multi_line = false # true/false # different lines. nl_func_call_end_multi_line = false # true/false +# Whether to add a newline after '<' of a template parameter list. +nl_template_start = false # true/false + +# Whether to add a newline after each ',' in a template parameter list. +nl_template_args = false # true/false + +# Whether to add a newline before '>' of a template parameter list. +nl_template_end = false # true/false + # (OC) Whether to put each Objective-C message parameter on a separate line. # See nl_oc_msg_leave_one_liner. nl_oc_msg_args = false # true/false @@ -1842,6 +1871,12 @@ nl_before_return = false # true/false # close brace. nl_after_return = true # true/false +# (Java) Whether to put a blank line before a member '.' or '->' operators. +nl_before_member = ignore # ignore/add/remove/force + +# (Java) Whether to put a blank line after a member '.' or '->' operators. +nl_after_member = ignore # ignore/add/remove/force + # Whether to double-space commented-entries in 'struct'/'union'/'enum'. nl_ds_struct_enum_cmt = false # true/false @@ -2947,5 +2982,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number # `macro-close END_MESSAGE_MAP` # # -# option(s) with 'not default' value: 145 +# option(s) with 'not default' value: 148 #