Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 301 insertions, 85 deletions

diff --git a/src/uncrustify.cfg b/src/uncrustify.cfg
index f9e6617d40..ffd4955829 100644
--- a/src/uncrustify.cfg
+++ b/src/uncrustify.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.75.1_f
+# Uncrustify-0.78.1_f
 
 #
 # General options
@@ -84,7 +84,7 @@ sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 sp_arith_additive               = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force/not_defined
+sp_assign                       = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space around '=' in C++11 lambda capture specifications.
 #
@@ -101,6 +101,12 @@ sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the opening parenthesis and before the closing
 # parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
 # '[]( <here> int x <here> ){ ... }'.
 sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
@@ -125,12 +131,12 @@ sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = force    # ignore/add/remove/force/not_defined
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'enum {'.
 #
 # Default: add
-sp_enum_brace                   = add      # ignore/add/remove/force/not_defined
+sp_enum_brace                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
 sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
@@ -195,9 +201,36 @@ sp_before_ptr_star              = force    # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
@@ -232,13 +265,24 @@ sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
+# prototype or function definition. If set to ignore, sp_before_ptr_star is
+# used instead.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a pointer star '*' in the trailing return of a
 # function prototype or function definition.
 sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
@@ -297,6 +341,7 @@ sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
+# if empty.
 sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
@@ -343,7 +388,7 @@ sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of 'for' statements.
-sp_inside_for                   = ignore   # ignore/add/remove/force/not_defined
+sp_inside_for                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of 'for' statements.
 #
@@ -433,6 +478,7 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 sp_inside_square                = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
+# if empty.
 sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
@@ -447,15 +493,15 @@ sp_after_comma                  = add      # ignore/add/remove/force/not_defined
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
@@ -497,7 +543,7 @@ sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
+sp_after_class_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
 sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
@@ -561,7 +607,7 @@ sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
+sp_inside_braces_enum           = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
 sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
@@ -591,6 +637,7 @@ sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
+# if empty.
 sp_inside_braces_empty          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
@@ -608,7 +655,7 @@ sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 sp_func_proto_paren             = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function declaration
-# without parameters.
+# if empty.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
@@ -618,7 +665,7 @@ sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 sp_func_def_paren               = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function definition
-# without parameters.
+# if empty.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
@@ -628,6 +675,16 @@ sp_inside_fparens               = remove   # ignore/add/remove/force/not_defined
 # Add or remove space inside function '(' and ')'.
 sp_inside_fparen                = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space inside the first parentheses in a function type, as in
 # 'void (*x)(...)'.
 sp_inside_tparen                = remove   # ignore/add/remove/force/not_defined
@@ -652,7 +709,7 @@ sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
+sp_func_call_paren              = remove   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -744,10 +801,10 @@ sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = add      # ignore/add/remove/force/not_defined
+sp_else_brace                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = add      # ignore/add/remove/force/not_defined
+sp_brace_else                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and the name of a typedef on the same line.
 sp_brace_typedef                = force    # ignore/add/remove/force/not_defined
@@ -816,7 +873,7 @@ sp_inv                          = remove   # ignore/add/remove/force/not_defined
 # affect the spacing after a '&' that is part of a type.
 #
 # Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
+sp_addr                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
@@ -915,7 +972,7 @@ sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
+sp_cond_colon                   = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the ':' in 'b ? t : f'.
 #
@@ -928,7 +985,7 @@ sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
 sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
+sp_cond_question                = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '?' in 'b ? t : f'.
 #
@@ -967,6 +1024,14 @@ sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after the opening of a C++ comment, as in '// <here> A'.
 sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
 # Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
 # A region marker is defined as a comment which is not preceded by other text
 # (i.e. the comment is the first non-whitespace on the line), and which starts
@@ -995,7 +1060,7 @@ sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and type in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside parenthesis of the new operator
+# Add or remove space inside parentheses of the new operator
 # as in 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
 
@@ -1049,6 +1114,12 @@ sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after '_'.
 sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = ignore   # ignore/add/remove/force/not_defined
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
 
@@ -1162,7 +1233,7 @@ indent_extern                   = false    # true/false
 indent_class                    = false    # true/false
 
 # Whether to ignore indent for the leading base class colon.
-indent_ignore_before_class_colon = false    # true/false
+indent_ignore_before_class_colon = true     # true/false
 
 # Additional indent before the leading base class colon.
 # Negative values decrease indent down to the first column.
@@ -1344,7 +1415,7 @@ indent_col1_multi_string_literal = false    # true/false
 indent_comment_align_thresh     = 3        # unsigned number
 
 # Whether to ignore indent for goto labels.
-indent_ignore_label             = false    # true/false
+indent_ignore_label             = true     # true/false
 
 # How to indent goto labels. Requires indent_ignore_label=false.
 #
@@ -1537,9 +1608,9 @@ indent_using_block              = true     # true/false
 # How to indent the continuation of ternary operator.
 #
 # 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 # 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
+indent_ternary_operator         = 2        # unsigned number
 
 # Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
@@ -1565,10 +1636,15 @@ donot_indent_func_def_close_paren = false    # true/false
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
 nl_collapse_empty_body          = true     # true/false
 
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
 # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 nl_assign_leave_one_liners      = false    # true/false
 
@@ -2021,6 +2097,12 @@ nl_template_end                 = false    # true/false
 # See nl_oc_msg_leave_one_liner.
 nl_oc_msg_args                  = false    # true/false
 
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = force    # ignore/add/remove/force/not_defined
 
@@ -2034,6 +2116,9 @@ nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove newline between 'return' and the return expression.
 nl_return_expr                  = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
@@ -2091,7 +2176,7 @@ nl_define_macro                 = false    # true/false
 # Whether to alter newlines between consecutive parenthesis closes. The number
 # of closing parentheses in a line will depend on respective open parenthesis
 # lines.
-nl_squeeze_paren_close          = false    # true/false
+nl_squeeze_paren_close          = true     # true/false
 
 # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
 # '#endif'. Does not affect top-level #ifdefs.
@@ -2227,7 +2312,7 @@ nl_max_blank_in_func            = 0        # unsigned number
 # The number of newlines inside an empty function body.
 # This option overrides eat_blanks_after_open_brace and
 # eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
+# nl_collapse_empty_body_functions=true
 nl_inside_empty_func            = 0        # unsigned number
 
 # The number of newlines before a function prototype.
@@ -2265,8 +2350,21 @@ 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.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
 nl_after_func_body              = 0        # unsigned number
 
+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
 # The number of newlines after '}' of a multi-line function body in a class
 # declaration. Also affects class constructors/destructors.
 #
@@ -2279,12 +2377,6 @@ nl_after_func_body_class        = 0        # unsigned number
 # Overrides nl_after_func_body and nl_after_func_body_class.
 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).
-nl_func_var_def_blk             = 0        # unsigned number
-
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
@@ -2301,15 +2393,27 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of empty newlines before a block of variable definitions
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty 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.
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of empty newlines after a block of variable definitions
-# not at the top of a function body.
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2466,7 +2570,7 @@ pos_compare                     = ignore   # ignore/break/force/lead/trail/join/
 
 # The position of conditional operators, as in the '?' and ':' of
 # 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_conditional                 = lead     # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in wrapped expressions.
 pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
@@ -2625,11 +2729,6 @@ align_var_def_inline            = false    # true/false
 # 0: Don't align (default).
 align_assign_span               = 0        # unsigned number
 
-# The span for aligning on '{' in braced init list.
-#
-# 0: Don't align (default).
-align_braced_init_list_span     = 0        # unsigned number
-
 # The span for aligning on '=' in function prototype modifier.
 #
 # 0: Don't align (default).
@@ -2646,6 +2745,11 @@ align_assign_thresh             = 0        # number
 # Depends on 'align_assign_span' and 'align_assign_thresh' settings.
 align_assign_on_multi_var_defs  = false    # true/false
 
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
 # The threshold for aligning on '{' in braced init list.
 # Use a negative number for absolute thresholds.
 #
@@ -2764,6 +2868,13 @@ align_right_cmt_at_col          = 0        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
 # How to consider (or treat) the '*' in the alignment of function prototypes.
 #
 # 0: Part of the type     'void *   foo();' (default)
@@ -2813,9 +2924,22 @@ align_single_line_brace_gap     = 0        # unsigned number
 # 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
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether and how to align backslashes that split a macro onto multiple lines.
+# This will not work right if the macro contains a multi-line comment.
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -3099,9 +3223,12 @@ mod_full_brace_nl               = 0        # unsigned number
 #   mod_full_brace_function
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary parentheses on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
@@ -3123,6 +3250,12 @@ mod_remove_extra_semicolon      = true     # true/false
 # Whether to remove duplicate include.
 mod_remove_duplicate_include    = true     # true/false
 
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # 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
@@ -3190,7 +3323,7 @@ mod_move_case_return            = false    # true/false
 
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
-mod_case_brace                  = remove   # ignore/add/remove/force/not_defined
+mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove a void 'return;' that appears as the last statement in a
 # function.
@@ -3199,6 +3332,49 @@ mod_remove_empty_return         = false    # true/false
 # Add or remove the comma after the last value of an enumeration.
 mod_enum_last_comma             = add      # ignore/add/remove/force/not_defined
 
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 2        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = remove   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
 mod_sort_oc_properties          = false    # true/false
@@ -3230,6 +3406,16 @@ mod_sort_oc_property_nullability_weight = 0        # number
 # Preprocessor options
 #
 
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
 pp_indent                       = remove   # ignore/add/remove/force/not_defined
@@ -3250,11 +3436,11 @@ pp_indent_at_level0             = false    # true/false
 # Default: 1
 pp_indent_count                 = 1        # unsigned number
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = force    # ignore/add/remove/force/not_defined
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = force    # ignore/add/remove/force/not_defined
 
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
+# Sets the number of spaces per level added with pp_space_after.
+pp_space_count                  = 1        # unsigned number
 
 # The indent for '#region' and '#endregion' in C# and '#pragma region' in
 # C/C++. Negative values decrease indent down to the first column.
@@ -3286,22 +3472,34 @@ pp_include_at_level             = false    # true/false
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 2        # number
+
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
@@ -3309,7 +3507,7 @@ pp_indent_extern                = true     # true/false
 
 # How to indent braces directly inside #if, #else, and #endif.
 # Requires pp_if_indent_code=true and only applies to the indent of the
-# preprocesser that the braces are directly inside of.
+# preprocessor that the braces are directly inside of.
 #  0: No extra indent
 #  1: Indent by one level
 # -1: Preserve original indentation
@@ -3382,10 +3580,10 @@ use_indent_continue_only_once   = false    # true/false
 
 # The indentation can be:
 # - after the assignment, at the '[' character
-# - at the begin of the lambda body
+# - at the beginning of the lambda body
 #
-# true:  indentation will be after the assignment
-# false: indentation will be at the begin of the lambda body (default)
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
@@ -3437,6 +3635,23 @@ debug_timeout                   = 0        # number
 # 0: do not truncate.
 debug_truncate                  = 0        # unsigned number
 
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
@@ -3489,31 +3704,32 @@ debug_truncate                  = 0        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-set QUESTION                     FUNC_API_CHECK_TEXTLOCK
-set QUESTION                     FUNC_API_DEPRECATED_SINCE
-set QUESTION                     FUNC_API_FAST
-set QUESTION                     FUNC_API_LUA_ONLY
-set QUESTION                     FUNC_API_NOEXPORT
-set QUESTION                     FUNC_API_REMOTE_ONLY
-set QUESTION                     FUNC_API_SINCE
-set QUESTION                     FUNC_ATTR_ALWAYS_INLINE
-set QUESTION                     FUNC_ATTR_CONST
-set QUESTION                     FUNC_ATTR_MALLOC
-set QUESTION                     FUNC_ATTR_NONNULL_ALL
-set QUESTION                     FUNC_ATTR_NONNULL_ARG
-set QUESTION                     FUNC_ATTR_NONNULL_RET
-set QUESTION                     FUNC_ATTR_NORETURN
-set QUESTION                     FUNC_ATTR_NO_SANITIZE_UNDEFINED
-set QUESTION                     FUNC_ATTR_PRINTF
-set QUESTION                     FUNC_ATTR_PURE
-set QUESTION                     FUNC_ATTR_UNUSED
-set QUESTION                     FUNC_ATTR_WARN_UNUSED_RESULT
+set CLASS_COLON                  FUNC_API_DEPRECATED_SINCE
+set CLASS_COLON                  FUNC_API_FAST
+set CLASS_COLON                  FUNC_API_LUA_ONLY
+set CLASS_COLON                  FUNC_API_NOEXPORT
+set CLASS_COLON                  FUNC_API_REMOTE_ONLY
+set CLASS_COLON                  FUNC_API_SINCE
+set CLASS_COLON                  FUNC_API_TEXTLOCK
+set CLASS_COLON                  FUNC_API_TEXTLOCK_ALLOW_CMDWIN
+set CLASS_COLON                  FUNC_ATTR_ALWAYS_INLINE
+set CLASS_COLON                  FUNC_ATTR_CONST
+set CLASS_COLON                  FUNC_ATTR_MALLOC
+set CLASS_COLON                  FUNC_ATTR_NONNULL_ALL
+set CLASS_COLON                  FUNC_ATTR_NONNULL_ARG
+set CLASS_COLON                  FUNC_ATTR_NONNULL_RET
+set CLASS_COLON                  FUNC_ATTR_NORETURN
+set CLASS_COLON                  FUNC_ATTR_NO_SANITIZE_ADDRESS
+set CLASS_COLON                  FUNC_ATTR_NO_SANITIZE_UNDEFINED
+set CLASS_COLON                  FUNC_ATTR_PRINTF
+set CLASS_COLON                  FUNC_ATTR_PURE
+set CLASS_COLON                  FUNC_ATTR_WARN_UNUSED_RESULT
 set PP_PRAGMA                    PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
 set PP_PRAGMA                    PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
-set QUESTION                     REAL_FATTR_ALWAYS_INLINE
-set QUESTION                     REAL_FATTR_CONST
-set QUESTION                     REAL_FATTR_NONNULL_ALL
-set QUESTION                     REAL_FATTR_PURE
-set QUESTION                     REAL_FATTR_WARN_UNUSED_RESULT
-# option(s) with 'not default' value: 112
+set CLASS_COLON                  REAL_FATTR_ALWAYS_INLINE
+set CLASS_COLON                  REAL_FATTR_CONST
+set CLASS_COLON                  REAL_FATTR_NONNULL_ALL
+set CLASS_COLON                  REAL_FATTR_PURE
+set CLASS_COLON                  REAL_FATTR_WARN_UNUSED_RESULT
+# option(s) with 'not default' value: 135
 #