aboutsummaryrefslogtreecommitdiff
path: root/uncrustify/conf
diff options
context:
space:
mode:
Diffstat (limited to 'uncrustify/conf')
-rw-r--r--uncrustify/conf25
1 files changed, 13 insertions, 12 deletions
diff --git a/uncrustify/conf b/uncrustify/conf
index 8a04ef8..07a7816 100644
--- a/uncrustify/conf
+++ b/uncrustify/conf
@@ -908,7 +908,7 @@ nl_switch_brace = add # ignore/add/remove/force
# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace.
-nl_multi_line_cond = false # false/true
+nl_multi_line_cond = true # false/true
# Force a newline in a define after the macro name for multi-line defines.
nl_multi_line_define = false # false/true
@@ -1093,14 +1093,14 @@ nl_create_while_one_liner = false # false/true
#
# The position of arithmetic operators in wrapped expressions
-pos_arith = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
+pos_arith = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of assignment in wrapped expressions.
# Do not affect '=' followed by '{'
pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of boolean operators in wrapped expressions
-pos_bool = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
+pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of comparison operators in wrapped expressions
pos_compare = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force
@@ -1125,10 +1125,10 @@ pos_class_colon = ignore # ignore/lead/lead_break/lea
code_width = 80 # number
# Whether to fully split long 'for' statements at semi-colons
-ls_for_split_full = false # false/true
+ls_for_split_full = true # false/true
# Whether to fully split long function protos/calls at commas
-ls_func_split_full = false # false/true
+ls_func_split_full = true # false/true
#
# Blank line options
@@ -1144,7 +1144,7 @@ nl_after_func_proto = 0 # number
nl_after_func_proto_group = 0 # number
# The number of newlines after '}' of a multi-line function body
-nl_after_func_body = 2 # number
+nl_after_func_body = 3 # number
# The number of newlines after '}' of a multi-line function body in a class declaration
nl_after_func_body_class = 0 # number
@@ -1212,20 +1212,20 @@ eat_blanks_before_close_brace = false # false/true
#
# Add or remove braces on single-line 'do' statement
-mod_full_brace_do = remove # ignore/add/remove/force
+mod_full_brace_do = force # ignore/add/remove/force
# Add or remove braces on single-line 'for' statement
-mod_full_brace_for = add # ignore/add/remove/force
+mod_full_brace_for = remove # ignore/add/remove/force
# Add or remove braces on single-line function definitions. (Pawn)
mod_full_brace_function = ignore # ignore/add/remove/force
# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
-mod_full_brace_if = add # ignore/add/remove/force
+mod_full_brace_if = ignore # ignore/add/remove/force
# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
# If any must be braced, they are all braced. If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain = true # false/true
+mod_full_brace_if_chain = false # false/true
# Don't remove braces around statements that span N newlines
mod_full_brace_nl = 3 # number
@@ -1323,7 +1323,7 @@ cmt_cpp_nl_end = false # false/true
cmt_cpp_to_c = false # false/true
# Whether to put a star on subsequent comment lines
-cmt_star_cont = true # false/true
+cmt_star_cont = false # false/true
# The number of spaces to insert at the start of subsequent comment lines
cmt_sp_before_star_cont = 0 # number
@@ -1346,7 +1346,8 @@ cmt_insert_file_footer = "" # string
# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }
-cmt_insert_func_header = "func_header" # string
+cmt_insert_func_header = "" # string
+#cmt_insert_func_header = "func_header" # string
# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
# Will substitute $(class) with the class name.