Update uncrustify

    Remove indentation of preprocessor directives inside #if blocks
    Remove space after # of #if blocks
    Remove newline between '}' and 'else'
    Remove newline between 'else if' and '{'
    Remove space inside braces
    Remove blank lines before '}'
    Ignore braces on single-line of 'while' statement
    Change code width to 100 columns
    Add aligning all preprocessors
    Add the span for aligning comments that end lines to 2
    Add spaces to indent 'case' from 'switch' to 4
    Add braces on a single-line 'do', 'while', 'for', 'if' statement
    Add braces to all blocks of an 'if'/'else if'/'else' chain

Signed-off-by: KHANH LUONG HONG DUY <khanh.luonghongduy@vn.bosch.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/util/uncrustify.cfg b/uncrustify.cfg
index cb6761a..faec3ae 100644
--- a/util/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -434,7 +434,7 @@ sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
 sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = force    # ignore/add/remove/force
+sp_inside_braces                = remove    # ignore/add/remove/force
 
 # Add or remove space inside '{}'.
 sp_inside_braces_empty          = remove   # ignore/add/remove/force
@@ -1030,7 +1030,7 @@ indent_sing_line_comments       = 0        # unsigned number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-indent_switch_case              = 0        # unsigned number
+indent_switch_case              = 4        # unsigned number
 
 # Whether to indent preprocessor statements inside of switch statements.
 #
@@ -1214,7 +1214,7 @@ indent_ignore_asm_block         = false    # true/false
 #
 
 # Whether to collapse empty blocks between '{' and '}'.
-nl_collapse_empty_body          = true     # true/false
+nl_collapse_empty_body          = 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
@@ -1358,11 +1358,11 @@ nl_union_brace                  = ignore   # ignore/add/remove/force
 nl_if_brace                     = remove   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = add      # ignore/add/remove/force
+nl_brace_else                   = remove      # ignore/add/remove/force
 
 # Add or remove newline between 'else if' and '{'. If set to ignore,
 # nl_if_brace is used instead.
-nl_elseif_brace                 = add      # ignore/add/remove/force
+nl_elseif_brace                 = remove      # ignore/add/remove/force
 
 # Add or remove newline between 'else' and '{'.
 nl_else_brace                   = remove   # ignore/add/remove/force
@@ -1906,7 +1906,7 @@ nl_inside_namespace             = 0        # unsigned number
 eat_blanks_after_open_brace     = false    # true/false
 
 # Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
+eat_blanks_before_close_brace   = true    # true/false
 
 # How aggressively to remove extra newlines not in preprocessor.
 #
@@ -1978,7 +1978,7 @@ pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/
 #
 
 # Try to limit code width to N columns.
-code_width                      = 120      # unsigned number
+code_width                      = 100      # unsigned number
 
 # Whether to fully split long 'for' statements at semi-colons.
 ls_for_split_full               = true     # true/false
@@ -2170,7 +2170,7 @@ align_typedef_amp_style         = 0        # unsigned number
 # The span for aligning comments that end lines.
 #
 # 0 = Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
+align_right_cmt_span            = 2        # unsigned number
 
 # If aligning comments, whether to mix with comments after '}' and #endif with
 # less than three spaces before the comment.
@@ -2391,17 +2391,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = remove   # ignore/add/remove/force
+mod_full_brace_do               = add   # ignore/add/remove/force
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = remove   # ignore/add/remove/force
+mod_full_brace_for              = add   # ignore/add/remove/force
 
 # (Pawn) Add or remove braces on a single-line function definition.
 mod_full_brace_function         = force    # ignore/add/remove/force
 
 # Add or remove braces on a single-line 'if' statement. Braces will not be
 # removed if the braced statement contains an 'else'.
-mod_full_brace_if               = remove   # ignore/add/remove/force
+mod_full_brace_if               = add   # ignore/add/remove/force
 
 # Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
 # have, or do not have, braces. If true, braces will be added if any block
@@ -2409,15 +2409,15 @@ mod_full_brace_if               = remove   # ignore/add/remove/force
 # blocks.
 #
 # Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = true     # true/false
+mod_full_brace_if_chain         = false     # true/false
 
 # Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
 # If true, mod_full_brace_if_chain will only remove braces from an 'if' that
 # does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
+mod_full_brace_if_chain_only    = true    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = remove   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force
 
 # Add or remove braces on single-line 'using ()' statement.
 mod_full_brace_using            = ignore   # ignore/add/remove/force
@@ -2537,7 +2537,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force
+pp_indent                       = remove   # ignore/add/remove/force
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2552,7 +2552,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = remove    # ignore/add/remove/force
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 3        # unsigned number
@@ -2569,7 +2569,7 @@ pp_region_indent_code           = false    # true/false
 #
 # =0: Indent preprocessors using output_tab_size
 # >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
+pp_indent_if                    = 4        # number
 
 # Whether to indent the code between #if, #else and #endif.
 pp_if_indent_code               = false    # true/false