Add --force_curly_braces option to insert braces around single-statem…

src/dfmt/config.d

@@ -69,6 +69,8 @@ struct Config
     OptionalBoolean dfmt_space_after_statement_keyword;
     ///
     OptionalBoolean dfmt_space_before_named_arg_colon;
+    ///
+    OptionalBoolean dfmt_force_curly_braces;
 
     mixin StandardEditorConfigFields;
 
@@ -101,6 +103,7 @@ struct Config
         dfmt_single_indent = OptionalBoolean.f;
         dfmt_reflow_property_chains = OptionalBoolean.t;
         dfmt_space_before_named_arg_colon = OptionalBoolean.f;
+        dfmt_force_curly_braces = OptionalBoolean.f;
     }
 
     /**

src/dfmt/main.d

@@ -107,6 +107,9 @@ else
             case "space_after_keywords":
                 optConfig.dfmt_space_after_keywords = optVal;
                 break;
+            case "force_curly_braces":
+                optConfig.dfmt_force_curly_braces = optVal;
+                break;
             default:
                 assert(false, "Invalid command-line switch");
             }
@@ -141,7 +144,8 @@ else
                 "template_constraint_style", &optConfig.dfmt_template_constraint_style,
                 "keep_line_breaks", &handleBooleans,
                 "single_indent", &handleBooleans,
-                "reflow_property_chains", &handleBooleans);
+                "reflow_property_chains", &handleBooleans,
+                "force_curly_braces", &handleBooleans);
             // dfmt on
         }
         catch (GetOptException e)
@@ -356,6 +360,7 @@ Formatting Options:
     --space_before_named_arg_colon
     --single_indent
     --reflow_property_chains
+    --force_curly_braces
         `,
             optionsToString!(typeof(Config.dfmt_template_constraint_style)));
 }

tests/allman/force_curly_braces.d.ref

@@ -0,0 +1,351 @@
+// Test: force_curly_braces option
+// Tests various braceless constructs that should get braces added
+
+// 1. Simple if without braces
+int test1(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    return 0;
+}
+
+// 2. if/else without braces
+int test2(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// 3. Nested if without braces
+void test3(int a, int b)
+{
+    if (a)
+    {
+        if (b)
+        {
+            doSomething();
+        }
+    }
+}
+
+// 4. if/else if/else chain
+int test4(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    else if (x < 0)
+    {
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// 5. for loop without braces
+void test5()
+{
+    for (int i = 0; i < 10; i++)
+    {
+        doSomething();
+    }
+}
+
+// 6. foreach without braces
+void test6(int[] arr)
+{
+    foreach (x; arr)
+    {
+        doSomething();
+    }
+}
+
+// 7. while without braces
+void test7()
+{
+    while (condition())
+    {
+        doSomething();
+    }
+}
+
+// 8. Mixed: if braced, else not
+int test8(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// 9. Mixed: if not braced, else braced
+int test9(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// 10. Already fully braced (should be unchanged)
+int test10(int x)
+{
+    if (x > 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// 11. Nested mixed: if with for body
+void test11(int[] arr)
+{
+    if (arr.length > 0)
+    {
+        foreach (x; arr)
+        {
+            doSomething();
+        }
+    }
+}
+
+// 12. while with if body
+void test12()
+{
+    while (condition())
+    {
+        if (check())
+        {
+            doSomething();
+        }
+    }
+}
+
+// 13. do-while without braces
+void test13()
+{
+    do
+    {
+        doSomething();
+    }
+    while (condition());
+}
+
+// 14. scope(exit) without braces
+void test14()
+{
+    scope (exit)
+    {
+        cleanup();
+    }
+    doWork();
+
+    scope int[] array = new int[](127);
+    scope T!() x = 5;
+}
+
+// 15. synchronized without braces
+void test15()
+{
+    synchronized
+    {
+        doSomething();
+    }
+}
+
+// 16. debug without parens
+void test16()
+{
+    debug
+    {
+        doSomething();
+    }
+}
+
+// 17. version/else
+void test17()
+{
+    version (Windows)
+    {
+        doWindows();
+    }
+    else
+    {
+        doPosix();
+    }
+}
+
+// 18. with statement
+void test18()
+{
+    with (someObj)
+    {
+        doSomething();
+    }
+}
+
+// 19. catch without braces
+void test19()
+{
+    try
+    {
+        doSomething();
+    }
+    catch (Exception e)
+    {
+        handleError();
+    }
+}
+
+// 20. debug with else
+void test20()
+{
+    debug
+    {
+        doDebug();
+    }
+    else
+    {
+        doRelease();
+    }
+}
+
+// 21. finally without braces
+void test21()
+{
+    try
+    {
+        doSomething();
+    }
+    catch (Exception e)
+    {
+        handleError();
+    }
+    finally
+    {
+        cleanup();
+    }
+}
+
+// 22. try/catch/finally all braceless as body of if
+void test22(bool flag)
+{
+    if (flag)
+    {
+        try
+        {
+            doSomething();
+        }
+        catch (Exception e)
+        {
+            handleError();
+        }
+    }
+}
+
+// 23. dfmt off region — braceless code should NOT get braces
+void test23()
+{
+    // dfmt off
+    if (x)
+        doSomething();
+    // dfmt on
+    if (y)
+    {
+        doSomethingElse();
+    }
+}
+
+// 24. else debug without parens
+void test24()
+{
+    version (Windows)
+    {
+        doWindows();
+    }
+    else
+    {
+        debug
+        {
+            doDebugPosix();
+        }
+    }
+}
+
+// 25. version + unittest
+void test25()
+{
+    string command;
+    version (Posix)
+    {
+        command ~= " 2> /dev/null 1> /dev/null";
+    }
+
+    version (Posix)
+    {
+        command ~= " 2> /dev/null 1> /dev/null";
+    }
+
+    unittest
+    {
+        version (Posix)
+        {
+            command ~= " 2> /dev/null 1> /dev/null";
+        }
+    }
+}
+
+// 26. Trailing comments on if statement
+unittest
+{
+    if (imin.value > 0x10FFFFUL) // One
+    {
+        imin.value = 0x10FFFFUL; // Two
+    }
+}
+
+// 27. Complex version/else/debug/else chain
+unittest
+{
+    version (Windows)
+    {
+        __locale_decpoint = save;
+    }
+    else version (Foo)
+    {
+        __locale_decpoint = save;
+    }
+    else
+    {
+        debug
+        {
+            __x = 3;
+        }
+        else
+        {
+            foobar();
+        }
+    }
+}