From 454cc6d2a687a7719107556b4b07b5230ee81b55 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 13 Sep 2019 14:20:05 +0300 Subject: [PATCH 1/6] update --- default.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.cfg b/default.cfg index e2981bb..ac149f7 100644 --- a/default.cfg +++ b/default.cfg @@ -1330,7 +1330,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 @@ -1345,10 +1345,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 From 3c3c71e69c09b0551de64c717b7e1a0074527a25 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 17 Sep 2019 07:48:22 +0300 Subject: [PATCH 2/6] 20190913 --- default.cfg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/default.cfg b/default.cfg index ac149f7..b23b207 100644 --- a/default.cfg +++ b/default.cfg @@ -179,6 +179,8 @@ sp_before_unnamed_ptr_star = remove # ignore/add/remove/force sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. +# +# Overrides sp_type_func. sp_after_ptr_star = add # ignore/add/remove/force # Add or remove space after pointer caret '^', if followed by a word. @@ -189,6 +191,8 @@ sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a function # prototype or function definition. +# +# Overrides sp_after_ptr_star and sp_type_func. sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by an open @@ -207,10 +211,14 @@ sp_before_byref = remove # ignore/add/remove/force sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. +# +# Overrides sp_type_func. sp_after_byref = add # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a function # prototype or function definition. +# +# Overrides sp_after_byref and sp_type_func. sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a function @@ -2826,5 +2834,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 # From e5214f32b8f1701b88ba59af1d00b9185d98a1f9 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 27 Sep 2019 07:27:06 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=2020190926?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.cfg | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/default.cfg b/default.cfg index b23b207..a728652 100644 --- a/default.cfg +++ b/default.cfg @@ -97,6 +97,10 @@ sp_cpp_lambda_square_brace = ignore # ignore/add/remove/force # '[](int x) { ... }'. sp_cpp_lambda_paren_brace = ignore # ignore/add/remove/force +# Add or remove space between a lambda body and its call operator of an +# immediately invoked lambda, as in '[]( ... ){ ... } ( ... )'. +sp_cpp_lambda_fparen = ignore # ignore/add/remove/force + # Add or remove space around assignment operator '=' in a prototype. # # If set to ignore, use sp_assign. @@ -172,7 +176,7 @@ sp_brace_brace = force # ignore/add/remove/force sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a -# variable name. If set to 'ignore', sp_before_ptr_star is used instead. +# variable name. If set to ignore, sp_before_ptr_star is used instead. sp_before_unnamed_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*'. @@ -207,7 +211,7 @@ sp_before_ptr_star_func = remove # ignore/add/remove/force sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a -# variable name. If set to 'ignore', sp_before_byref is used instead. +# variable name. If set to ignore, sp_before_byref is used instead. sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. @@ -253,7 +257,7 @@ sp_inside_angle_empty = ignore # ignore/add/remove/force # Add or remove space between '>' and ':'. sp_angle_colon = ignore # ignore/add/remove/force -# Add or remove space after '<>'. +# Add or remove space after '>'. sp_after_angle = force # ignore/add/remove/force # Add or remove space between '>' and '(' as found in 'new List(foo);'. @@ -496,6 +500,7 @@ sp_func_def_paren = remove # ignore/add/remove/force sp_func_def_paren_empty = remove # ignore/add/remove/force # Add or remove space inside empty function '()'. +# Overrides sp_after_angle unless use_sp_after_angle_always is set to true. sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')'. @@ -528,7 +533,7 @@ sp_fparen_dbrace = ignore # ignore/add/remove/force sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without -# parameters. If set to 'ignore' (the default), sp_func_call_paren is used. +# parameters. If set to ignore (the default), sp_func_call_paren is used. sp_func_call_paren_empty = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function @@ -2761,6 +2766,11 @@ use_indent_continue_only_once = false # true/false # false: indentation will be used every time (default) indent_cpp_lambda_only_once = true # true/false +# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the +# historic behavior, but is probably not the desired behavior, so this is off +# by default. +use_sp_after_angle_always = false # true/false + # Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially, # this tries to format these so that they match Qt's normalized form (i.e. the # result of QMetaObject::normalizedSignature), which can slightly improve the From c0b239f206be532a80b1db56b7a4a1950e96ec49 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 2 Oct 2019 14:20:36 +0300 Subject: [PATCH 4/6] update --- default.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/default.cfg b/default.cfg index e2981bb..2f1e5ba 100644 --- a/default.cfg +++ b/default.cfg @@ -1961,7 +1961,7 @@ nl_property_brace = ignore # ignore/add/remove/force # applicable, otherwise no change. # # Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace. -nl_inside_namespace = 0 # unsigned number +nl_inside_namespace = 2 # unsigned number # Whether to remove blank lines after '{'. eat_blanks_after_open_brace = true # true/false @@ -2547,27 +2547,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 = 5 # 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 = 20 # 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 = 20 # 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 = 20 # unsigned number # Whether to take care of the case by the mod_sort_xx options. mod_sort_case_sensitive = false # true/false From c3eed90064385494de298c5eddeb2e782d415768 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 2 Oct 2019 14:21:51 +0300 Subject: [PATCH 5/6] update --- default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.cfg b/default.cfg index 1e2b411..d9a99fb 100644 --- a/default.cfg +++ b/default.cfg @@ -2564,7 +2564,7 @@ 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 = 5 # 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. From a81f6a48e03c767e3cc768813bf970e2188899d1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 2 Oct 2019 14:23:45 +0300 Subject: [PATCH 6/6] update --- default.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/default.cfg b/default.cfg index d9a99fb..4199c93 100644 --- a/default.cfg +++ b/default.cfg @@ -2560,15 +2560,15 @@ 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 = 20 # 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. @@ -2576,11 +2576,11 @@ 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 = 20 # 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 = 20 # 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