Fix #43

src/dfmt.d

@@ -816,6 +816,12 @@ private:
         writeToken(); // switch
         write(" ");
         writeParens(true);
+        if (current.type == tok!"with")
+        {
+            writeToken();
+            write(" ");
+            writeParens(true);
+        }
         if (current.type != tok!"{")
             return;
         if (config.braceStyle == BraceStyle.otbs)
@@ -853,12 +859,27 @@ private:
                 writeToken();
                 write(" ");
             }
-            else if (current.type == tok!":" && peekIs(tok!".."))
+            else if (current.type == tok!":")
             {
-                writeToken();
+                if (peekIs(tok!".."))
-                write(" ");
+                {
-                writeToken();
+                    writeToken();
-                write(" ");
+                    write(" ");
+                    writeToken();
+                    write(" ");
+                }
+                else if (peekIs(tok!"identifier") && peek2Is(tok!":"))
+                {
+                    writeToken();
+                    indentLevel++;
+                    newline();
+                    writeToken();
+                    writeToken();
+                    indentLevel++;
+                    newline();
+                }
+                else
+                    goto peek;
             }
             else
             {

tests/issue0043.d

@@ -0,0 +1,12 @@
+unittest
+{
+	switch (something) with (stuff){
+	case 1:	case 2:
+label:doStuff();
+	case 3:
+		doOtherSTuff();
+		goto label;
+default:
+break;
+}
+}

tests/issue0043.d.ref

@@ -0,0 +1,15 @@
+unittest
+{
+    switch (something) with (stuff)
+    {
+    case 1:
+    case 2:
+    label:
+        doStuff();
+    case 3:
+        doOtherSTuff();
+        goto label;
+    default:
+        break;
+    }
+}