tools/uncrustify: Update config for v0.71.0.

This is the result of running... uncrustify -c tools/uncrustify.cfg --update-config-with-doc -o tools/uncrustify.cfg ...with some manual fixups to correct places where it changed things it should not have. Essentially it just adds new config parameters introduced in v0.71.0 with their default values. Signed-off-by: David Lechner <[email protected]>
ozbenh · Jun 14, 2020 · b4d0d7b · b4d0d7b
1 parent ecd7826
commit b4d0d7b
Showing 1 changed file with 114 additions and 4 deletions.
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.71.0
+# Uncrustify-0.71.0_f
 
 #
 # General options
@@ -37,13 +37,18 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+disable_processing_nl_cont      = false    # true/false
+
 # Specify the marker used in comments to disable processing of part of the
 # file.
+# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *FORMAT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
+# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *FORMAT-ON*"     # string
@@ -604,6 +609,10 @@ sp_catch_paren                  = ignore   # ignore/add/remove/force
 # in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
 sp_oc_catch_paren               = ignore   # ignore/add/remove/force
 
+# (OC) Add or remove space before Objective-C protocol list
+# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
 sp_oc_classname_paren           = ignore   # ignore/add/remove/force
@@ -669,6 +678,10 @@ sp_try_brace                    = ignore   # ignore/add/remove/force
 # Add or remove space between get/set and '{' if on the same line.
 sp_getset_brace                 = ignore   # ignore/add/remove/force
 
+# Add or remove space between a variable and '{' for C++ uniform
+# initialization.
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+
 # Add or remove space between a variable and '{' for a namespace.
 #
 # Default: add
@@ -1107,6 +1120,10 @@ indent_member_single            = false    # true/false
 # Spaces to indent single line ('//') comments on lines before code.
 indent_sing_line_comments       = 0        # unsigned number
 
+# When opening a paren for a control statement (if, for, while, etc), increase
+# the indent level by this value. Negative values decrease the indent level.
+indent_sparen_extra             = 0        # number
+
 # Whether to indent trailing single line ('//') comments relative to the code
 # instead of trying to keep the same absolute column.
 indent_relative_single_line_comments = false    # true/false
@@ -1213,12 +1230,19 @@ indent_preserve_sql             = false    # true/false
 # Default: true
 indent_align_assign             = false    # true/false
 
+# If true, the indentation of the chunks after a '=' sequence will be set at
+# LHS token indentation column before '='.
+indent_off_after_assign         = false    # true/false
+
 # Whether to align continued statements at the '('. If false or the '(' is
 # followed by a newline, the next line indent is one tab.
 #
 # Default: true
 indent_align_paren              = false    # true/false
 
+# (OC) Whether to indent Objective-C code inside message selectors.
+indent_oc_inside_msg_sel        = false    # true/false
+
 # (OC) Whether to indent Objective-C blocks at brace level instead of usual
 # rules.
 indent_oc_block                 = false    # true/false
@@ -1278,6 +1302,15 @@ indent_token_after_brace        = true     # true/false
 # Whether to indent the body of a C++11 lambda.
 indent_cpp_lambda_body          = false    # true/false
 
+# How to indent compound literals that are being returned.
+# true: add both the indent from return & the compound literal open brace (ie:
+#       2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only add
+#        the indent for the return.
+#
+# Default: true
+indent_compound_literal_return  = true     # true/false
+
 # (C#) Whether to indent a 'using' block if no braces are used.
 #
 # Default: true
@@ -1290,6 +1323,12 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
+# Whether to indent the statments inside ternary operator.
+indent_inside_ternary_operator  = false    # true/false
+
+# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
+indent_off_after_return         = false    # true/false
+
 # If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
 indent_off_after_return_new     = false    # true/false
 
@@ -1323,7 +1362,7 @@ nl_getset_leave_one_liners      = false    # true/false
 nl_cs_property_leave_one_liners = false    # true/false
 
 # Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# night modify nl_func_type_name
+# might modify nl_func_type_name
 nl_func_leave_one_liners        = false    # true/false
 
 # Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
@@ -1430,6 +1469,9 @@ nl_else_brace                   = remove   # ignore/add/remove/force
 # Add or remove newline between 'else' and 'if'.
 nl_else_if                      = ignore   # ignore/add/remove/force
 
+# Add or remove newline before '{' opening brace
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+
 # Add or remove newline before 'if'/'else if' closing parenthesis.
 nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
 
@@ -1678,6 +1720,9 @@ nl_func_decl_args               = ignore   # ignore/add/remove/force
 # Add or remove newline after each ',' in a function definition.
 nl_func_def_args                = ignore   # ignore/add/remove/force
 
+# Add or remove newline after each ',' in a function call.
+nl_func_call_args               = ignore   # ignore/add/remove/force
+
 # Whether to add a newline after each ',' in a function declaration if '('
 # and ')' are in different lines. If false, nl_func_decl_args is used instead.
 nl_func_decl_args_multi_line    = false    # true/false
@@ -1719,6 +1764,9 @@ nl_func_call_empty              = ignore   # ignore/add/remove/force
 # has preference over nl_func_call_start_multi_line.
 nl_func_call_start              = ignore   # ignore/add/remove/force
 
+# Whether to add a newline before ')' in a function call.
+nl_func_call_end                = ignore   # ignore/add/remove/force
+
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
 nl_func_call_start_multi_line   = false    # true/false
@@ -1731,6 +1779,9 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
+# Whether to respect nl_func_call_XXX option incase of closure args.
+nl_func_call_args_multi_line_ignore_closures = false    # true/false
+
 # Whether to add a newline after '<' of a template parameter list.
 nl_template_start               = false    # true/false
 
@@ -1865,7 +1916,7 @@ nl_before_return                = false    # true/false
 # close brace.
 nl_after_return                 = false    # true/false
 
-# (Java) Whether to put a blank line before a member '.' or '->' operators.
+# Whether to put a blank line before a member '.' or '->' operators.
 nl_before_member                = ignore   # ignore/add/remove/force
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
@@ -2128,6 +2179,26 @@ nl_after_annotation             = ignore   # ignore/add/remove/force
 # (Java) Add or remove newline between two annotations.
 nl_between_annotation           = ignore   # ignore/add/remove/force
 
+# The number of newlines before a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_before_whole_file_ifdef      = 0        # unsigned number
+
+# The number of newlines after a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_after_whole_file_ifdef       = 0        # unsigned number
+
+# The number of newlines before a whole-file #endif.
+#
+# 0: No change (default).
+nl_before_whole_file_endif      = 0        # unsigned number
+
+# The number of newlines after a whole-file #endif.
+#
+# 0: No change (default).
+nl_after_whole_file_endif       = 0        # unsigned number
+
 #
 # Positioning options
 #
@@ -2497,6 +2568,11 @@ align_oc_msg_colon_first        = false    # true/false
 # on the ':'.
 align_oc_decl_colon             = false    # true/false
 
+# (OC) Whether to not align parameters in an Objectve-C message call if first
+# colon is not on next line of the message call (the same way Xcode does
+# aligment)
+align_oc_msg_colon_xcode_like   = false    # true/false
+
 #
 # Comment modification options
 #
@@ -2728,6 +2804,25 @@ mod_sort_using                  = false    # true/false
 # break your code if your includes/imports have ordering dependencies.
 mod_sort_include                = false    # true/false
 
+# Whether to prioritize '#include' and '#import' statements that contain
+# filename without extension when sorting is enabled.
+mod_sort_incl_import_prioritize_filename = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that does not
+# contain extensions when sorting is enabled.
+mod_sort_incl_import_prioritize_extensionless = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# angle over quotes when sorting is enabled.
+mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
+
+# Whether to ignore file extension in '#include' and '#import' statements
+# for sorting comparison.
+mod_sort_incl_import_ignore_extension = false    # true/false
+
+# Whether to group '#include' and '#import' statements when sorting is enabled.
+mod_sort_incl_import_grouping_enabled = false    # true/false
+
 # Whether to move a 'break' that appears after a fully braced 'case' before
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
@@ -2914,6 +3009,11 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
+# If true: the form feed character is removed from the list
+# of whitespace characters.
+# See https://en.cppreference.com/w/cpp/string/byte/isspace
+use_form_feed_no_more_as_whitespace_character = false    # true/false
+
 #
 # Warn levels - 1: error, 2: warning (default), 3: note
 #
@@ -2924,6 +3024,16 @@ use_options_overriding_for_qt_macros = true     # true/false
 # Default: 2
 warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 
+# Limit the number of loops.
+# Used by uncrustify.cpp to exit from infinite loop.
+# 0: no limit.
+debug_max_number_of_loops       = 0        # number
+
+# Set the number of the line to protocol;
+# Used in the function prot_the_line if the 2. parameter is zero.
+# 0: nothing protocol.
+debug_line_number_to_protocol   = 0        # number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
@@ -2976,7 +3086,7 @@ warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 0
+# option(s) with 'not default' value: 67
 #
 
 # Custom types for MicroPython