Skip to content

Commit b080692

Browse files
committed
Fix uncrustify config for newer uncrustify versions
Updated deprecated options to match newer uncrustify requirements: - indent_comma_paren/indent_bool_paren: false → 0 (now numeric) - align_nl_cont: true → 1 (now numeric) - nl_func_var_def_blk → nl_var_def_blk_end_func_top (renamed option) - pp_space → pp_space_after (renamed option) This fixes the last CI test failure across all platforms.
1 parent 46dbd6f commit b080692

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

tests/uncrustify_defaults.cfg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ indent_relative_single_line_comments=false
1919
indent_col1_comment=true
2020
indent_access_spec_body=false
2121
indent_paren_nl=false
22-
indent_comma_paren=false
23-
indent_bool_paren=false
22+
indent_comma_paren=0
23+
indent_bool_paren=0
2424
indent_square_nl=false
2525
indent_preserve_sql=false
2626
indent_align_assign=true
@@ -38,7 +38,7 @@ align_on_operator=true
3838
align_mix_var_proto=false
3939
align_single_line_func=true
4040
align_single_line_brace=true
41-
align_nl_cont=true
41+
align_nl_cont=1
4242
align_left_shift=true
4343
nl_collapse_empty_body=true
4444
nl_assign_leave_one_liners=false
@@ -109,7 +109,7 @@ align_right_cmt_span=4
109109
align_right_cmt_at_col=1
110110
align_func_proto_span=3
111111
nl_end_of_file_min=1
112-
nl_func_var_def_blk=0
112+
nl_var_def_blk_end_func_top=0
113113
code_width=80
114114
nl_max=3
115115
nl_after_func_proto=0
@@ -240,5 +240,5 @@ mod_full_brace_for=remove
240240
mod_full_brace_if=remove
241241
mod_full_brace_while=remove
242242
mod_paren_on_return=remove
243-
pp_space=add
243+
pp_space_after=add
244244
indent_switch_case=2

0 commit comments

Comments
 (0)