Apply uncrustify 0.82.0 changes

Author: naisila

uncrustify/citus-style.cfg

@@ -1,4 +1,4 @@
-# Uncrustify 0.61
+# Citus style according to Uncrustify 0.82.0
 
 #
 # General options
@@ -161,8 +161,8 @@ indent_func_throw                         = 0        # number
 # Usually set to 0, 1, or indent_columns.
 indent_member                             = 0        # number
 
-# Spaces to indent single line ('//') comments on lines before code
-indent_sing_line_comments                 = 0        # number
+# Spaces to indent single line ('//') comments on lines before code.
+indent_single_line_comments_before = 0        # unsigned number
 
 # If set, will indent trailing single line ('//') comments relative
 # to the code instead of trying to keep the same absolute column
@@ -205,11 +205,17 @@ indent_paren_nl                           = false    # false/true
 # 2: Indent to the brace level
 indent_paren_close                        = 0        # number
 
-# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
-indent_comma_paren                        = false    # false/true
+# How to indent a comma when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_comma_paren                        = -1       # number
 
-# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
-indent_bool_paren                         = false    # false/true
+# How to indent a Boolean operator when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_bool_paren                         = -1       # number
 
 # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
 indent_first_bool_expr                    = false    # false/true
@@ -266,8 +272,9 @@ sp_assign                                 = force   # ignore/add/remove/force
 # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign
 sp_cpp_lambda_assign                      = ignore   # ignore/add/remove/force
 
-# Add or remove space after the capture specification in C++11 lambda.
-sp_cpp_lambda_paren                       = ignore   # ignore/add/remove/force
+# Add or remove space after the capture specification of a C++11 lambda when
+# an argument list is present, as in '[] <here> (int x){ ... }'.
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
 
 # Add or remove space around assignment operator '=' in a prototype
 sp_assign_default                         = ignore   # ignore/add/remove/force
@@ -314,9 +321,6 @@ sp_paren_paren                            = remove   # ignore/add/remove/force
 # Add or remove space between back-to-back parens: ')(' vs ') ('
 sp_cparen_oparen                          = ignore   # ignore/add/remove/force
 
-# Whether to balance spaces inside nested parens
-sp_balance_nested_parens                  = false    # false/true
-
 # Add or remove space between ')' and '{'
 sp_paren_brace                            = force   # ignore/add/remove/force
 
@@ -612,8 +616,9 @@ 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                             = add      # ignore/add/remove/force
+# Add or remove space between type and open brace of an unnamed temporary
+# direct-list-initialization.
+sp_type_brace_init_lst                    = add      # ignore/add/remove/force
 
 # Add or remove space between a variable and '{' for a namespace
 sp_word_brace_ns                          = add      # ignore/add/remove/force
@@ -762,11 +767,11 @@ sp_endif_cmt                              = ignore   # ignore/add/remove/force
 # Controls the spaces after 'new', 'delete', and 'delete[]'
 sp_after_new                              = ignore   # ignore/add/remove/force
 
-# Controls the spaces before a trailing or embedded comment
-sp_before_tr_emb_cmt                      = ignore   # ignore/add/remove/force
+# Add or remove space before a trailing comment.
+sp_before_tr_cmt                          = ignore   # ignore/add/remove/force
 
-# Number of spaces before a trailing or embedded comment
-sp_num_before_tr_emb_cmt                  = 0        # number
+# Number of spaces before a trailing comment.
+sp_num_before_tr_cmt                      = 0        # unsigned number
 
 # Control space between a Java annotation and the open paren.
 sp_annotation_paren                       = ignore   # ignore/add/remove/force
@@ -914,9 +919,16 @@ align_single_line_brace_gap               = 0        # number
 # The span for aligning ObjC msg spec (0=don't align)
 align_oc_msg_spec_span                    = 0        # number
 
-# Whether to align macros wrapped with a backslash and a newline.
+# 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.
-align_nl_cont                             = false    # false/true
+#
+# 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
 
 # # Align macro functions and variables together
 align_pp_define_together                  = false    # false/true
@@ -991,9 +1003,14 @@ nl_assign_square                          = ignore   # ignore/add/remove/force
 # Add or remove newline after '= [' (D only). Will also affect the newline before the ']'
 nl_after_square_assign                    = ignore   # ignore/add/remove/force
 
-# 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        # number
+# 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 number of newlines before a block of typedefs
 # 0 = No change (default)
@@ -1466,9 +1483,18 @@ mod_full_brace_function                   = ignore   # ignore/add/remove/force
 # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 mod_full_brace_if                         = force   # ignore/add/remove/force
 
-# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
-# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain                   = false    # false/true
+# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain                   = 0        # unsigned number
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl                         = 0        # number
@@ -1626,11 +1652,11 @@ pp_indent_at_level                        = false    # false/true
 # Default=1.
 pp_indent_count                           = 1        # number
 
-# Add or remove space after # based on pp_level of #if blocks
-pp_space                                  = ignore   # ignore/add/remove/force
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                            = ignore   # ignore/add/remove/force
 
-# Sets the number of spaces added with pp_space
-pp_space_count                            = 0        # number
+# Sets the number of spaces per level added with pp_space_after.
+pp_space_count                            = 0        # unsigned number
 
 # The indent for #region and #endregion in C# and '#pragma region' in C/C++
 pp_indent_region                          = 0        # number