diff --git a/documentation/htdocs/default.cfg b/documentation/htdocs/default.cfg index 4f37b8d1b0..911df22d24 100644 --- a/documentation/htdocs/default.cfg +++ b/documentation/htdocs/default.cfg @@ -1,4 +1,4 @@ -# Uncrustify 0.54 +# Uncrustify 0.55 # # General options @@ -333,7 +333,7 @@ sp_after_comma = ignore # ignore/add/remove/force # Add or remove space before ',' sp_before_comma = remove # ignore/add/remove/force -# Add or remove space before the variadic '...' +# Add or remove space before the variadic '...' when preceded by a non-punctuator sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' @@ -521,6 +521,14 @@ sp_after_oc_return_type = ignore # ignore/add/remove/force # '@selector(msgName).' vs '@selector (msgName)' sp_after_oc_at_sel = ignore # ignore/add/remove/force +# Add or remove space before a block pointer caret +# '^int (int arg){...}' vs. ' ^int (int arg){...}' +sp_before_oc_block_caret = ignore # ignore/add/remove/force + +# Add or remove space after a block pointer caret +# '^int (int arg){...}' vs. '^ int (int arg){...}' +sp_after_oc_block_caret = ignore # ignore/add/remove/force + # Add or remove space around the ':' in 'b ? t : f' sp_cond_colon = ignore # ignore/add/remove/force @@ -536,6 +544,9 @@ sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' sp_cmt_cpp_start = ignore # ignore/add/remove/force +# Controls the spaces between #else or #endif and a trailing comment +sp_endif_cmt = ignore # ignore/add/remove/force + # # Code alignment (not left column spaces/tabs) # @@ -689,8 +700,8 @@ align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true align_left_shift = true # false/true -# Align parameters in an Obj-C message on the ':' -align_oc_msg_colon = false # false/true +# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) +align_oc_msg_colon_span = 0 # number # # Newline adding and removing options @@ -855,12 +866,18 @@ nl_func_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration nl_func_decl_start = ignore # ignore/add/remove/force +# Overrides nl_func_decl_start when there is only one paramter. +nl_func_decl_start_single = ignore # ignore/add/remove/force + # Add or remove newline after each ',' in a function declaration nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration nl_func_decl_end = ignore # ignore/add/remove/force +# Overrides nl_func_decl_end when there is only one paramter. +nl_func_decl_end_single = ignore # ignore/add/remove/force + # Add or remove newline between '()' in a function declaration. nl_func_decl_empty = ignore # ignore/add/remove/force @@ -884,10 +901,14 @@ nl_after_brace_open = false # false/true # placed between the open brace and a trailing single-line comment. nl_after_brace_open_cmt = false # false/true -# Whether to put a newline after a virtual brace open. +# Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. nl_after_vbrace_open = false # false/true +# Whether to put a newline after a virtual brace open with an empty body. +# These occur in un-braced if/while/do/for statement bodies. +nl_after_vbrace_open_empty = false # false/true + # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. nl_after_brace_close = false # false/true @@ -957,7 +978,8 @@ nl_create_while_one_liner = false # false/true # The position of arithmetic operators in wrapped expressions pos_arith = ignore # ignore/lead/trail -# The position of assignment in wrapped expressions +# The position of assignment in wrapped expressions. +# Do not affect '=' followed by '{' pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions diff --git a/etc/defaults.cfg b/etc/defaults.cfg index 4f37b8d1b0..911df22d24 100644 --- a/etc/defaults.cfg +++ b/etc/defaults.cfg @@ -1,4 +1,4 @@ -# Uncrustify 0.54 +# Uncrustify 0.55 # # General options @@ -333,7 +333,7 @@ sp_after_comma = ignore # ignore/add/remove/force # Add or remove space before ',' sp_before_comma = remove # ignore/add/remove/force -# Add or remove space before the variadic '...' +# Add or remove space before the variadic '...' when preceded by a non-punctuator sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' @@ -521,6 +521,14 @@ sp_after_oc_return_type = ignore # ignore/add/remove/force # '@selector(msgName).' vs '@selector (msgName)' sp_after_oc_at_sel = ignore # ignore/add/remove/force +# Add or remove space before a block pointer caret +# '^int (int arg){...}' vs. ' ^int (int arg){...}' +sp_before_oc_block_caret = ignore # ignore/add/remove/force + +# Add or remove space after a block pointer caret +# '^int (int arg){...}' vs. '^ int (int arg){...}' +sp_after_oc_block_caret = ignore # ignore/add/remove/force + # Add or remove space around the ':' in 'b ? t : f' sp_cond_colon = ignore # ignore/add/remove/force @@ -536,6 +544,9 @@ sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' sp_cmt_cpp_start = ignore # ignore/add/remove/force +# Controls the spaces between #else or #endif and a trailing comment +sp_endif_cmt = ignore # ignore/add/remove/force + # # Code alignment (not left column spaces/tabs) # @@ -689,8 +700,8 @@ align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true align_left_shift = true # false/true -# Align parameters in an Obj-C message on the ':' -align_oc_msg_colon = false # false/true +# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) +align_oc_msg_colon_span = 0 # number # # Newline adding and removing options @@ -855,12 +866,18 @@ nl_func_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration nl_func_decl_start = ignore # ignore/add/remove/force +# Overrides nl_func_decl_start when there is only one paramter. +nl_func_decl_start_single = ignore # ignore/add/remove/force + # Add or remove newline after each ',' in a function declaration nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration nl_func_decl_end = ignore # ignore/add/remove/force +# Overrides nl_func_decl_end when there is only one paramter. +nl_func_decl_end_single = ignore # ignore/add/remove/force + # Add or remove newline between '()' in a function declaration. nl_func_decl_empty = ignore # ignore/add/remove/force @@ -884,10 +901,14 @@ nl_after_brace_open = false # false/true # placed between the open brace and a trailing single-line comment. nl_after_brace_open_cmt = false # false/true -# Whether to put a newline after a virtual brace open. +# Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. nl_after_vbrace_open = false # false/true +# Whether to put a newline after a virtual brace open with an empty body. +# These occur in un-braced if/while/do/for statement bodies. +nl_after_vbrace_open_empty = false # false/true + # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. nl_after_brace_close = false # false/true @@ -957,7 +978,8 @@ nl_create_while_one_liner = false # false/true # The position of arithmetic operators in wrapped expressions pos_arith = ignore # ignore/lead/trail -# The position of assignment in wrapped expressions +# The position of assignment in wrapped expressions. +# Do not affect '=' followed by '{' pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions