diff --git a/uncrustify.cfg b/uncrustify.cfg index 8b735defd3..bfc84fbc5e 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -66,7 +66,7 @@ indent_class_colon = false # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = true # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute indent_var_def_blk = 0 # number @@ -395,13 +395,13 @@ sp_return_paren = add # ignore/add/remove/force sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = remove # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = add # ignore/add/remove/force # Add or remove space between macro function ')' and value sp_macro_func = add # ignore/add/remove/force @@ -492,13 +492,13 @@ sp_before_send_oc_colon = ignore # ignore/add/remove/force sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = add # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = force # ignore/add/remove/force # Control the space around the D '..' operator. sp_range = ignore # ignore/add/remove/force @@ -685,10 +685,10 @@ nl_end_of_file = force # ignore/add/remove/force nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = add # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' nl_after_square_assign = ignore # ignore/add/remove/force @@ -723,7 +723,7 @@ nl_elseif_brace = force # ignore/add/remove/force nl_else_brace = force # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' nl_brace_finally = ignore # ignore/add/remove/force @@ -741,7 +741,7 @@ nl_getset_brace = ignore # ignore/add/remove/force nl_for_brace = force # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'catch' nl_brace_catch = force # ignore/add/remove/force @@ -821,7 +821,7 @@ nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = true # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. @@ -837,13 +837,14 @@ nl_squeeze_ifdef = false # false/true nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' +# Dick: this needs to stay at ignore until the trailing else support is fixed. nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = force # ignore/add/remove/force +nl_after_for = add # ignore/add/remove/force # Add or remove newline before 'while' nl_before_while = ignore # ignore/add/remove/force @@ -852,16 +853,16 @@ nl_before_while = ignore # ignore/add/remove/force nl_after_while = add # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' nl_after_switch = add # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = force # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = force # ignore/add/remove/force +nl_after_do = add # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum nl_ds_struct_enum_cmt = true # false/true @@ -945,7 +946,7 @@ nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 1 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. @@ -969,7 +970,7 @@ nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 1 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. @@ -1123,7 +1124,7 @@ pp_indent_count = 1 # number pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 1 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ pp_indent_region = 0 # number @@ -1132,7 +1133,7 @@ pp_indent_region = 0 # number pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 1 # number # Control whether to indent the code between #if, #else and #endif when not at file-level pp_if_indent_code = false # false/true