Add indent_braces_no_class option

echristophe · echristophe · commit feec2a8fd457 · 2010-03-20T23:44:28.000+08:00
diff --git a/src/indent.cpp b/src/indent.cpp
@@ -728,7 +728,11 @@ void indent_text(void)
       {
          brace_indent = (cpd.settings[UO_indent_braces].b &&
                          (!cpd.settings[UO_indent_braces_no_func].b ||
-                          (pc->parent_type != CT_FUNC_DEF)));
+                          (pc->parent_type != CT_FUNC_DEF)) &&
+                         (!cpd.settings[UO_indent_braces_no_func].b ||
+                          (pc->parent_type != CT_FUNC_CLASS)) &&
+                         (!cpd.settings[UO_indent_braces_no_class].b ||
+                          (pc->parent_type != CT_CLASS)));
       }
 
       if (pc->type == CT_BRACE_CLOSE)
diff --git a/src/options.cpp b/src/options.cpp
@@ -463,6 +463,8 @@ void register_options(void)
                   "Whether braces are indented to the body level");
    unc_add_option("indent_braces_no_func", UO_indent_braces_no_func, AT_BOOL,
                   "Disabled indenting function braces if indent_braces is true");
+   unc_add_option("indent_braces_no_class", UO_indent_braces_no_class, AT_BOOL,
+                  "Disabled indenting class braces if indent_braces is true");
    unc_add_option("indent_brace_parent", UO_indent_brace_parent, AT_BOOL,
                   "Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.");
    unc_add_option("indent_namespace", UO_indent_namespace, AT_BOOL,
diff --git a/src/options.h b/src/options.h
@@ -127,6 +127,7 @@ enum uncrustify_options
    UO_indent_brace,              // spaces to indent '{' from level (usually 0)
    UO_indent_braces,             // whether to indent the braces or not
    UO_indent_braces_no_func,     // whether to not indent the function braces (depends on UO_indent_braces)
+   UO_indent_braces_no_class,    // whether to not indent the class braces (depends on UO_indent_braces)
    UO_indent_brace_parent,       // indent the braces based on the parent size (if=3, for=4, etc)
    UO_indent_label,              // 0=left >0=col from left, <0=sub from brace indent
    UO_indent_access_spec,        // same as indent_label, but for "private:", "public:"

Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,11 @@ void indent_text(void)`
`728`	`728`	`{`
`729`	`729`	`brace_indent = (cpd.settings[UO_indent_braces].b &&`
`730`	`730`	`(!cpd.settings[UO_indent_braces_no_func].b \|\|`
`731`		`- (pc->parent_type != CT_FUNC_DEF)));`
	`731`	`+ (pc->parent_type != CT_FUNC_DEF)) &&`
	`732`	`+ (!cpd.settings[UO_indent_braces_no_func].b \|\|`
	`733`	`+ (pc->parent_type != CT_FUNC_CLASS)) &&`
	`734`	`+ (!cpd.settings[UO_indent_braces_no_class].b \|\|`
	`735`	`+ (pc->parent_type != CT_CLASS)));`
`732`	`736`	`}`
`733`	`737`
`734`	`738`	`if (pc->type == CT_BRACE_CLOSE)`