Fix #107

src/dfmt.d

@@ -457,10 +457,10 @@ private:
 
     void formatColon()
     {
-		regenLineBreakHintsIfNecessary(index);
+        regenLineBreakHintsIfNecessary(index);
         if (linebreakHints.canFindIndex(index))
         {
-			pushWrapIndent();
+            pushWrapIndent();
             newline();
             writeToken();
             write(" ");
@@ -605,8 +605,9 @@ private:
 
     void formatSwitch()
     {
-        if (indents.length == 0 || indents.top != tok!"with")
+        if (indents.length > 0 && indents.top == tok!"with")
-            indents.push(tok!"switch");
+            indents.pop();
+        indents.push(tok!"switch");
         writeToken(); // switch
         write(" ");
     }

tests/allman/issue0107.d.ref

@@ -0,0 +1,15 @@
+void msgpackToGValue(MsgValue input)
+{
+    with (MsgValue.Type) switch (input.type)
+    {
+    case boolean:
+        a();
+        break;
+    case unsigned:
+        b();
+        break;
+    default:
+        assert(false);
+    }
+    return retVal;
+}

tests/issue0107.d

@@ -0,0 +1,15 @@
+void msgpackToGValue(MsgValue input)
+{
+	with (MsgValue.Type) switch (input.type)
+	{
+	case boolean:
+		a();
+		break;
+	case unsigned:
+		b();
+		break;
+	default:
+		assert(false);
+	}
+	return retVal;
+}

tests/otbs/issue0107.d.ref

@@ -0,0 +1,13 @@
+void msgpackToGValue(MsgValue input) {
+    with (MsgValue.Type) switch (input.type) {
+    case boolean:
+        a();
+        break;
+    case unsigned:
+        b();
+        break;
+    default:
+        assert(false);
+    }
+    return retVal;
+}