Skip to content

Commit d1512ab

Browse files
committed
Update indent config for uncrustify 0.65 compat.
It applies the struct new line rule slightly differently than before, and changing it to 1 from 3 results in no changes in our existing base whether using uncrustify 0.64 or 0.65. Additionally, 0.65 seems to want to change indentation on some usages of 'break' outside of bracketed regions, so I'm adding a line that will force breaks to be put within brackets, which avoids the problem and makes the codebase more consistent at the same time.
1 parent 511b31d commit d1512ab

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

uncrustify/citus-style.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ nl_before_cpp_comment = 0 # number
13921392
nl_after_multiline_comment = false # false/true
13931393

13941394
# The number of newlines after '}' or ';' of a struct/enum/union definition
1395-
nl_after_struct = 3 # number
1395+
nl_after_struct = 1 # number
13961396

13971397
# The number of newlines after '}' or ';' of a class definition
13981398
nl_after_class = 0 # number
@@ -1522,7 +1522,7 @@ mod_sort_using = false # false/true
15221522
mod_sort_include = false # false/true
15231523

15241524
# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
1525-
mod_move_case_break = false # false/true
1525+
mod_move_case_break = true # false/true
15261526

15271527
# Will add or remove the braces around a fully braced case statement.
15281528
# Will only remove the braces if there are no variable declarations in the block.

0 commit comments

Comments
 (0)