Merge pull request #7558 from evsh/uncrustify

Update uncrustify config
This commit is contained in:
Eugene Shalygin 2017-10-09 20:04:37 +02:00 committed by GitHub
commit 8c75fdcb4c

View file

@ -1,15 +1,17 @@
set FOR foreach
set WORD slots
newlines = LF
newlines = LF
indent_with_tabs = 0
indent_columns = 4
indent_namespace = true
indent_class = true
indent_col1_comment = true
indent_access_spec = -4
indent_switch_case = 0
indent_namespace = true
indent_class = true
indent_col1_comment = true
indent_access_spec = -4
indent_case_shift = 0
indent_case_brace = 4
nl_after_func_body = 2
nl_collapse_empty_body = false
@ -40,12 +42,14 @@ nl_namespace_brace = add
mod_full_brace_if = remove
mod_full_brace_if_chain = true
mod_full_brace_do = remove
mod_full_brace_while = remove
mod_full_brace_while = remove
mod_full_brace_for = remove
mod_full_brace_if_chain = true
mod_full_brace_if_chain = true
mod_full_brace_nl = 3
mod_full_paren_if_bool = true
mod_full_paren_if_bool = true
mod_move_case_break = true
sp_cond_colon = force
sp_else_brace = force
sp_try_brace = force
sp_arith = force
@ -55,14 +59,19 @@ sp_pp_concat = ignore
sp_pp_stringify = ignore
sp_bool = force
sp_after_class_colon = force
sp_before_class_colon = remove
sp_before_class_colon = force
sp_after_constr_colon = force
sp_cmt_cpp_start = add
sp_cmt_cpp_doxygen = true
sp_endif_cmt = force
sp_angle_shift = remove
sp_permit_cpp11_shift = true
sp_before_sparen = force
sp_after_operator = remove
sp_after_operator_sym = remove
sp_after_for_colon = force
sp_before_for_colon = force
sp_between_new_paren = force
sp_before_ptr_star = force
sp_before_byref = force