From bd022ba0487ba4c85c1e31d195862aafbcac21fa Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 19 Nov 2019 13:48:32 +0300 Subject: [PATCH] Update to 0.70.0 --- default.cfg | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/default.cfg b/default.cfg index 07e11e2..a2943d5 100644 --- a/default.cfg +++ b/default.cfg @@ -61,6 +61,15 @@ utf8_byte = true # true/false # Force the output encoding to UTF-8. utf8_force = true # true/false +# Add or remove space between 'do' and '{'. +sp_do_brace_open = ignore # ignore/add/remove/force + +# Add or remove space between '}' and 'while'. +sp_brace_close_while = ignore # ignore/add/remove/force + +# Add or remove space between 'while' and '('. +sp_while_paren_open = ignore # ignore/add/remove/force + # # Spacing options # @@ -1040,19 +1049,30 @@ indent_func_def_force_col1 = false # true/false # rather than aligning parameters under the open parenthesis. indent_func_call_param = false # true/false -# Same as indent_func_call_param, but for function definitions. +# Whether to indent continued function definition parameters one indent level, +# rather than aligning parameters under the open parenthesis. indent_func_def_param = false # true/false -# Same as indent_func_call_param, but for function prototypes. +# for function definitions, only if indent_func_def_param is false +# Allows to align params when appropriate and indent them when not +# behave as if it was true if paren position is more than this value +# if paren position is more than the option value +indent_func_def_param_paren_pos_threshold = 0 # unsigned number + +# Whether to indent continued function call prototype one indent level, +# rather than aligning parameters under the open parenthesis. indent_func_proto_param = false # true/false -# Same as indent_func_call_param, but for class declarations. +# Whether to indent continued function call declaration one indent level, +# rather than aligning parameters under the open parenthesis. indent_func_class_param = false # true/false -# Same as indent_func_call_param, but for class variable constructors. +# Whether to indent continued class variable constructors one indent level, +# rather than aligning parameters under the open parenthesis. indent_func_ctor_var_param = false # true/false -# Same as indent_func_call_param, but for template parameter lists. +# Whether to indent continued template parameter list one indent level, +# rather than aligning parameters under the open parenthesis. indent_template_param = false # true/false # Double the indent for indent_func_xxx_param options. @@ -1112,9 +1132,12 @@ indent_col1_multi_string_literal = false # true/false # Default: 1 indent_label = 1 # number -# Same as indent_label, but for access specifiers that are followed by a +# How to indent access specifiers that are followed by a # colon. # +# >0: Absolute column where 1 is the leftmost column +# <=0: Subtract from brace indent +# # Default: 1 indent_access_spec = 1 # number @@ -1311,6 +1334,15 @@ nl_oc_mdef_brace = force # ignore/add/remove/force # (OC) Add or remove newline between Objective-C block signature and '{'. nl_oc_block_brace = ignore # ignore/add/remove/force +# (OC) Add or remove blank line before '@interface' statement. +nl_oc_before_interface = ignore # ignore/add/remove/force + +# (OC) Add or remove blank line before '@implementation' statement. +nl_oc_before_implementation = ignore # ignore/add/remove/force + +# (OC) Add or remove blank line before '@end' statement. +nl_oc_before_end = ignore # ignore/add/remove/force + # (OC) Add or remove newline between '@interface' and '{'. nl_oc_interface_brace = ignore # ignore/add/remove/force @@ -1847,6 +1879,11 @@ nl_create_while_one_liner = true # true/false # a single line. nl_create_func_def_one_liner = false # true/false +# Whether to collapse a function definition whose body (not counting braces) +# is only one line so that the entire definition (prototype, braces, body) is +# a single line. +nl_create_list_one_liner = false # true/false + # Whether to split one-line simple unbraced if statements into two lines by # adding a newline, as in 'if(b) i++;'. nl_split_if_one_liner = false # true/false @@ -2910,5 +2947,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number # `macro-close END_MESSAGE_MAP` # # -# option(s) with 'not default' value: 140 +# option(s) with 'not default' value: 145 #