Skip to content

Commit

Permalink
Update indent config for uncrustify 0.65 compat.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jasonmp85 committed Jul 11, 2017
1 parent 511b31d commit d1512ab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions uncrustify/citus-style.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ nl_before_cpp_comment = 0 # number
nl_after_multiline_comment = false # false/true

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

# The number of newlines after '}' or ';' of a class definition
nl_after_class = 0 # number
Expand Down Expand Up @@ -1522,7 +1522,7 @@ mod_sort_using = false # false/true
mod_sort_include = false # false/true

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

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

0 comments on commit d1512ab

Please sign in to comment.