Fix #108

src/dfmt.d

@@ -223,7 +223,8 @@ private:
             write(" ");
             if (currentIs(tok!"("))
                 writeParens(false);
-            if (!currentIs(tok!"switch") && !currentIs(tok!"with") && !currentIs(tok!"{"))
+            if (!currentIs(tok!"switch") && !currentIs(tok!"with")
+                    && !currentIs(tok!"{") && !(currentIs(tok!"final") && peekIs(tok!"switch")))
             {
                 newline();
             }
@@ -457,15 +458,7 @@ private:
 
     void formatColon()
     {
-        regenLineBreakHintsIfNecessary(index);
+        if (astInformation.caseEndLocations.canFindIndex(current.index)
-        if (linebreakHints.canFindIndex(index))
-        {
-            pushWrapIndent();
-            newline();
-            writeToken();
-            write(" ");
-        }
-        else if (astInformation.caseEndLocations.canFindIndex(current.index)
                 || astInformation.attributeDeclarationLines.canFindIndex(current.line))
         {
             writeToken();
@@ -482,6 +475,7 @@ private:
         }
         else
         {
+            regenLineBreakHintsIfNecessary(index);
             if (peekIs(tok!".."))
                 writeToken();
             else if (isBlockHeader(1) && !peekIs(tok!"if"))
@@ -489,6 +483,13 @@ private:
                 writeToken();
                 write(" ");
             }
+            else if (linebreakHints.canFindIndex(index))
+            {
+                pushWrapIndent();
+                newline();
+                writeToken();
+                write(" ");
+            }
             else
             {
                 write(" : ");
@@ -563,6 +564,7 @@ private:
             }
             writeToken();
             newline();
+            linebreakHints = [];
         }
     }
 

tests/allman/issue0108.d.ref

@@ -0,0 +1,12 @@
+unittest
+{
+    with (SomeEnum) final switch (value)
+    {
+    case a:
+        aa();
+        break;
+    case b:
+        bb();
+        break;
+    }
+}

tests/issue0108.d

@@ -0,0 +1,12 @@
+unittest
+{
+	with (SomeEnum) final switch (value)
+	{
+	case a:
+		aa();
+		break;
+	case b:
+		bb();
+		break;
+	}
+}

tests/otbs/issue0108.d.ref

@@ -0,0 +1,10 @@
+unittest {
+    with (SomeEnum) final switch (value) {
+    case a:
+        aa();
+        break;
+    case b:
+        bb();
+        break;
+    }
+}