diff --git a/default.cfg b/default.cfg index e2981bb..f1bf808 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,13 +176,15 @@ 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 '*'. 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 +195,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 @@ -203,14 +211,18 @@ 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. +# +# 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 @@ -245,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);'. @@ -327,6 +339,9 @@ 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 asm block. +sp_before_square_asm_block = ignore # ignore/add/remove/force + # Add or remove space before '[]'. sp_before_squares = ignore # ignore/add/remove/force @@ -480,7 +495,10 @@ sp_func_proto_paren = remove # ignore/add/remove/force # without parameters. sp_func_proto_paren_empty = remove # ignore/add/remove/force -# Add or remove space between function name and '(' on function definition. +# Add or remove space between function name and '(' with a typedef specifier. +sp_func_type_paren = ignore # ignore/add/remove/force + +# Add or remove space between alias name and '(' of a non-pointer function type typedef. sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function definition @@ -488,6 +506,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 ')'. @@ -520,7 +539,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 @@ -1912,6 +1931,21 @@ nl_before_class = 0 # unsigned number # The number of newlines after '}' or ';' of a class definition. nl_after_class = 0 # unsigned number +# The number of newlines before a namespace. +nl_before_namespace = 2 # unsigned number + +# 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 + +# The number of newlines after '}' of a namespace. +nl_after_namespace = 1 # unsigned number + # The number of newlines before an access specifier label. This also includes # the Qt-specific 'signals:' and 'slots:'. Will not change the newline count # if after a brace open. @@ -1954,15 +1988,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 = 0 # unsigned number - # Whether to remove blank lines after '{'. eat_blanks_after_open_brace = true # true/false @@ -2753,6 +2778,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