diff --git a/default.cfg b/default.cfg index d9acbab..4750d01 100644 --- a/default.cfg +++ b/default.cfg @@ -77,6 +77,9 @@ sp_arith_additive = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force +# Add or remove space around trailing return operator '->'. +sp_trailing_ret_t = force # ignore/add/remove/force + # Add or remove space around '=' in C++11 lambda capture specifications. # # Overrides sp_assign. @@ -151,7 +154,7 @@ sp_cparen_oparen = ignore # ignore/add/remove/force sp_balance_nested_parens = true # true/false # Add or remove space between ')' and '{'. -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space between nested braces, i.e. '{{' vs '{ {'. sp_brace_brace = force # ignore/add/remove/force @@ -161,7 +164,7 @@ 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. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +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 @@ -185,7 +188,7 @@ sp_ptr_star_paren = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a function # prototype or function definition. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a reference sign '&'. sp_before_byref = remove # ignore/add/remove/force @@ -225,7 +228,7 @@ sp_template_angle = ignore # ignore/add/remove/force sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>'. -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = force # ignore/add/remove/force # Add or remove space inside '<>'. sp_inside_angle_empty = ignore # ignore/add/remove/force @@ -234,7 +237,7 @@ sp_inside_angle_empty = ignore # ignore/add/remove/force sp_angle_colon = ignore # ignore/add/remove/force # Add or remove space after '<>'. -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '>' and '(' as found in 'new List(foo);'. sp_angle_paren = remove # ignore/add/remove/force @@ -1431,6 +1434,14 @@ nl_synchronized_brace = ignore # ignore/add/remove/force # nl_catch_brace. nl_multi_line_cond = false # true/false +# Add a newline after '(' if an if/for/while/switch condition spans multiple +# lines +nl_multi_line_sparen_open = ignore # ignore/add/remove/force + +# Add a newline before ')' if an if/for/while/switch condition spans multiple +# lines. Overrides nl_before_if_closing_paren if both are specified. +nl_multi_line_sparen_close = ignore # ignore/add/remove/force + # Force a newline in a define after the macro name for multi-line defines. nl_multi_line_define = false # true/false @@ -1810,7 +1821,7 @@ nl_after_func_class_proto_group = 0 # unsigned number nl_class_leave_one_liner_groups = false # true/false # The number of newlines after '}' of a multi-line function body. -nl_after_func_body = 0 # unsigned number +nl_after_func_body = 3 # unsigned number # The number of newlines after '}' of a multi-line function body in a class # declaration. Also affects class constructors/destructors. @@ -1827,42 +1838,42 @@ nl_after_func_body_one_liner = 0 # unsigned number # The number of blank lines after a block of variable definitions at the top # of a function body. # -# 0 = No change (default). +# 0: No change (default). nl_func_var_def_blk = 1 # unsigned number # The number of newlines before a block of typedefs. If nl_after_access_spec # is non-zero, that option takes precedence. # -# 0 = No change (default). +# 0: No change (default). nl_typedef_blk_start = 0 # unsigned number # The number of newlines after a block of typedefs. # -# 0 = No change (default). +# 0: No change (default). nl_typedef_blk_end = 0 # unsigned number # The maximum number of consecutive newlines within a block of typedefs. # -# 0 = No change (default). +# 0: No change (default). nl_typedef_blk_in = 0 # unsigned number # The number of newlines before a block of variable definitions not at the top # of a function body. If nl_after_access_spec is non-zero, that option takes # precedence. # -# 0 = No change (default). +# 0: No change (default). nl_var_def_blk_start = 0 # unsigned number # The number of newlines after a block of variable definitions not at the top # of a function body. # -# 0 = No change (default). +# 0: No change (default). nl_var_def_blk_end = 0 # unsigned number # The maximum number of consecutive newlines within a block of variable # definitions. # -# 0 = No change (default). +# 0: No change (default). nl_var_def_blk_in = 0 # unsigned number # The minimum number of newlines before a multi-line comment. @@ -1896,14 +1907,14 @@ nl_after_class = 0 # unsigned number # the Qt-specific 'signals:' and 'slots:'. Will not change the newline count # if after a brace open. # -# 0 = No change (default). +# 0: No change (default). nl_before_access_spec = 0 # unsigned number # The number of newlines after an access specifier label. This also includes # the Qt-specific 'signals:' and 'slots:'. Will not change the newline count # if after a brace open. # -# 0 = No change (default). +# 0: No change (default). # # Overrides nl_typedef_blk_start and nl_var_def_blk_start. nl_after_access_spec = 0 # unsigned number @@ -1911,24 +1922,24 @@ nl_after_access_spec = 0 # unsigned number # The number of newlines between a function definition and the function # comment, as in '// comment\n void foo() {...}'. # -# 0 = No change (default). +# 0: No change (default). nl_comment_func_def = 0 # unsigned number # The number of newlines after a try-catch-finally block that isn't followed # by a brace close. # -# 0 = No change (default). +# 0: No change (default). nl_after_try_catch_finally = 0 # unsigned number # (C#) The number of newlines before and after a property, indexer or event # declaration. # -# 0 = No change (default). +# 0: No change (default). nl_around_cs_property = 0 # unsigned number # (C#) The number of newlines between the get/set/add/remove handlers. # -# 0 = No change (default). +# 0: No change (default). nl_between_get_set = 0 # unsigned number # (C#) Add or remove newline between property and the '{'. @@ -1937,7 +1948,7 @@ 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 +# 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. @@ -2049,13 +2060,13 @@ align_func_params = false # true/false # The span for aligning parameter definitions in function on parameter name. # -# 0 = Don't align (default). +# 0: Don't align (default). align_func_params_span = 0 # unsigned number # The threshold for aligning function parameter definitions. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_func_params_thresh = 0 # number # The gap for aligning function parameter definitions. @@ -2063,13 +2074,13 @@ align_func_params_gap = 0 # unsigned number # The span for aligning constructor value. # -# 0 = Don't align (default). +# 0: Don't align (default). align_constr_value_span = 0 # unsigned number # The threshold for aligning constructor value. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_constr_value_thresh = 0 # number # The gap for aligning constructor value. @@ -2081,19 +2092,19 @@ align_same_func_call_params = false # true/false # The span for aligning function-call parameters for single line functions. # -# 0 = Don't align (default). +# 0: Don't align (default). align_same_func_call_params_span = 0 # unsigned number # The threshold for aligning function-call parameters for single line # functions. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_same_func_call_params_thresh = 0 # number # The span for aligning variable definitions. # -# 0 = Don't align (default). +# 0: Don't align (default). align_var_def_span = 0 # unsigned number # How to consider (or treat) the '*' in the alignment of variable definitions. @@ -2115,7 +2126,7 @@ align_var_def_amp_style = 0 # unsigned number # The threshold for aligning variable definitions. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_var_def_thresh = 0 # number # The gap for aligning variable definitions. @@ -2135,18 +2146,18 @@ align_var_def_inline = false # true/false # The span for aligning on '=' in assignments. # -# 0 = Don't align (default). +# 0: Don't align (default). align_assign_span = 0 # unsigned number # The span for aligning on '=' in function prototype modifier. # -# 0 = Don't align (default). +# 0: Don't align (default). align_assign_func_proto_span = 0 # unsigned number # The threshold for aligning on '=' in assignments. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_assign_thresh = 0 # number # How to apply align_assign_span to function declaration "assignments", i.e. @@ -2159,24 +2170,24 @@ align_assign_decl_func = 0 # unsigned number # The span for aligning on '=' in enums. # -# 0 = Don't align (default). +# 0: Don't align (default). align_enum_equ_span = 0 # unsigned number # The threshold for aligning on '=' in enums. # Use a negative number for absolute thresholds. # -# 0 = no limit (default). +# 0: no limit (default). align_enum_equ_thresh = 0 # number # The span for aligning class member definitions. # -# 0 = Don't align (default). +# 0: Don't align (default). align_var_class_span = 0 # unsigned number # The threshold for aligning class member definitions. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_var_class_thresh = 0 # number # The gap for aligning class member definitions. @@ -2184,13 +2195,13 @@ align_var_class_gap = 0 # unsigned number # The span for aligning struct/union member definitions. # -# 0 = Don't align (default). +# 0: Don't align (default). align_var_struct_span = 0 # unsigned number # The threshold for aligning struct/union member definitions. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions. @@ -2198,12 +2209,12 @@ align_var_struct_gap = 0 # unsigned number # The span for aligning struct initializer values. # -# 0 = Don't align (default). +# 0: Don't align (default). align_struct_init_span = 0 # unsigned number # The span for aligning single-line typedefs. # -# 0 = Don't align (default). +# 0: Don't align (default). align_typedef_span = 0 # unsigned number # The minimum space between the type and the synonym of a typedef. @@ -2234,7 +2245,7 @@ align_typedef_amp_style = 0 # unsigned number # The span for aligning comments that end lines. # -# 0 = Don't align (default). +# 0: Don't align (default). align_right_cmt_span = 0 # unsigned number # Minimum number of columns between preceding text and a trailing comment in @@ -2253,18 +2264,18 @@ align_right_cmt_same_level = false # true/false # aligned beyond this column, but which can be aligned in a lesser column, # may be "pulled in". # -# 0 = Ignore (default). +# 0: Ignore (default). align_right_cmt_at_col = 0 # unsigned number # The span for aligning function prototypes. # -# 0 = Don't align (default). +# 0: Don't align (default). align_func_proto_span = 0 # unsigned number # The threshold for aligning function prototypes. # Use a negative number for absolute thresholds. # -# 0 = No limit (default). +# 0: No limit (default). align_func_proto_thresh = 0 # number # Minimum gap between the return type and the function name. @@ -2291,7 +2302,7 @@ align_single_line_brace_gap = 0 # unsigned number # (OC) The span for aligning Objective-C message specifications. # -# 0 = Don't align (default). +# 0: Don't align (default). align_oc_msg_spec_span = 0 # unsigned number # Whether to align macros wrapped with a backslash and a newline. This will @@ -2321,7 +2332,7 @@ align_asm_colon = false # true/false # (OC) Span for aligning parameters in an Objective-C message call # on the ':'. # -# 0 = Don't align. +# 0: Don't align. align_oc_msg_colon_span = 0 # unsigned number # (OC) Whether to always align with the first parameter, even if it is too @@ -2549,6 +2560,9 @@ mod_add_long_ifdef_endif_comment = 0 # unsigned number # doesn't have a comment after the #else, a comment will be added. mod_add_long_ifdef_else_comment = 0 # unsigned number +# Whether to take care of the case by the mod_sort_xx options. +mod_sort_case_sensitive = false # true/false + # Whether to sort consecutive single-line 'import' statements. mod_sort_import = false # true/false @@ -2803,7 +2817,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number # `macro-close END_MESSAGE_MAP` # # -# option(s) with 'not default' value: 99 +# option(s) with 'not default' value: 107 # - -sp_trailing_ret_t = force