Fix #76

README.md

@@ -41,6 +41,7 @@ found in .editorconfig files.
 * **--split_operator_at_line_end**: See **dfmt_split_operator_at_line_end** below
 * **--tab_width**: See **tab_width** below
 * **--selective_import_space**: See **dfmt_selective_import_space** below
+* **--compact_labeled_statements**: See **dfmt_compact_labeled_statements** below
 
 ### Example
 ```
@@ -96,6 +97,7 @@ dfmt_split_operator_at_line_end | `true`, `false` | `false` | Place operators on
 dfmt_space_after_cast | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression
 dfmt_space_after_keywords (Not yet implemented) | `true`, `false` | `true` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`
 dfmt_selective_import_space | `true`, `false` | `true` | Insert space after the module name and before the `:` for selective imports
+dfmt_compact_labeled_statements | `true`, `false` | `true` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement
 
 ## Terminology
 * Braces - `{` and `}`

src/dfmt/config.d

@@ -40,6 +40,8 @@ struct Config
     OptionalBoolean dfmt_split_operator_at_line_end;
     ///
     OptionalBoolean dfmt_selective_import_space;
+    ///
+    OptionalBoolean dfmt_compact_labeled_statements;
 
     mixin StandardEditorConfigFields;
 
@@ -65,6 +67,7 @@ struct Config
         dfmt_space_after_keywords = OptionalBoolean.t;
         dfmt_split_operator_at_line_end = OptionalBoolean.f;
         dfmt_selective_import_space = OptionalBoolean.t;
+        dfmt_compact_labeled_statements = OptionalBoolean.t;
     }
 
     /**

src/dfmt/formatter.d

@@ -487,7 +487,10 @@ private:
             else if (isBlockHeader(1) && !peekIs(tok!"if"))
             {
                 writeToken();
+                if (config.dfmt_compact_labeled_statements)
                     write(" ");
+                else
+                    newline();
             }
             else if (linebreakHints.canFindIndex(index))
             {
@@ -1083,7 +1086,8 @@ private:
                     indentLevel = l;
                     switchLabel = true;
                 }
-                else if (!isBlockHeader(2) || peek2Is(tok!"if"))
+                else if (config.dfmt_compact_labeled_statements == OptionalBoolean.f
+                    || !isBlockHeader(2) || peek2Is(tok!"if"))
                 {
                     immutable l2 = indents.indentToMostRecent(tok!"{");
                     indentLevel = l2 == -1 ? indentLevel : l2;

src/dfmt/main.d

@@ -30,25 +30,29 @@ else
             import dfmt.editorconfig : OptionalBoolean;
             import std.exception : enforceEx;
             enforceEx!GetOptException(value == "true" || value == "false", "Invalid argument");
+            immutable OptionalBoolean optVal = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
             switch (option)
             {
             case "align_switch_statements":
-                optConfig.dfmt_align_switch_statements = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_align_switch_statements = optVal;
                 break;
             case "outdent_attributes":
-                optConfig.dfmt_outdent_attributes = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_outdent_attributes = optVal;
                 break;
             case "outdent_labels":
-                optConfig.dfmt_outdent_labels = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_outdent_labels = optVal;
                 break;
             case "space_after_cast":
-                optConfig.dfmt_space_after_cast = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_space_after_cast = optVal;
                 break;
             case "split_operator_at_line_end":
-                optConfig.dfmt_split_operator_at_line_end = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_split_operator_at_line_end = optVal;
                 break;
             case "selective_import_space":
-                optConfig.dfmt_selective_import_space = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                optConfig.dfmt_selective_import_space = optVal;
+                break;
+            case "compact_labeled_statements":
+                optConfig.dfmt_compact_labeled_statements = optVal;
                 break;
             default: assert(false, "Invalid command-line switch");
             }
@@ -71,6 +75,7 @@ else
                 "space_after_cast", &handleBooleans,
                 "selective_import_space", &handleBooleans,
                 "split_operator_at_line_end", &handleBooleans,
+                "compact_labeled_statements", &handleBooleans,
                 "tab_width", &optConfig.tab_width);
         }
         catch (GetOptException e)
@@ -167,7 +172,9 @@ Formatting Options:
     --outdent_attributes
     --outdent_labels
     --space_after_cast
-    --split_operator_at_line_end`);
+    --selective_import_space
+    --split_operator_at_line_end
+    --compact_labeled_statements`);
 }
 
 private string createFilePath(bool readFromStdin, string fileName)

tests/allman/issue0076.d.ref

@@ -0,0 +1,7 @@
+unittest
+{
+Label:
+    while (1)
+    {
+    }
+}

tests/gen_expected.sh

@@ -2,7 +2,7 @@ argsFile=$1.args
 if [ -e ${argsFile} ]; then
 	args=$(cat ${argsFile})
 fi
-echo ${args}
+echo "Args:" ${args}
 dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref
 dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref
 

tests/issue0076.args

@@ -0,0 +1 @@
+--compact_labeled_statements=false

tests/issue0076.d

@@ -0,0 +1,7 @@
+unittest
+{
+Label:
+	while (1)
+	{
+	}
+}

tests/otbs/issue0076.d.ref

@@ -0,0 +1,5 @@
+unittest {
+Label:
+    while (1) {
+    }
+}