From efc9d72c9573a34e4b1c34c4961b3120a94397ba Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 16 Mar 2015 15:45:22 -0700
Subject: [PATCH] Fix #107

---
 src/dfmt.d                   |  9 +++++----
 tests/allman/issue0107.d.ref | 15 +++++++++++++++
 tests/issue0107.d            | 15 +++++++++++++++
 tests/otbs/issue0107.d.ref   | 13 +++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 tests/allman/issue0107.d.ref
 create mode 100644 tests/issue0107.d
 create mode 100644 tests/otbs/issue0107.d.ref

diff --git a/src/dfmt.d b/src/dfmt.d
index 93e5310..017271e 100644
--- a/src/dfmt.d
+++ b/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")
-            indents.push(tok!"switch");
+        if (indents.length > 0 && indents.top == tok!"with")
+            indents.pop();
+        indents.push(tok!"switch");
         writeToken(); // switch
         write(" ");
     }
diff --git a/tests/allman/issue0107.d.ref b/tests/allman/issue0107.d.ref
new file mode 100644
index 0000000..2442d05
--- /dev/null
+++ b/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;
+}
diff --git a/tests/issue0107.d b/tests/issue0107.d
new file mode 100644
index 0000000..4f6d5e9
--- /dev/null
+++ b/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;
+}
diff --git a/tests/otbs/issue0107.d.ref b/tests/otbs/issue0107.d.ref
new file mode 100644
index 0000000..bf8a59f
--- /dev/null
+++ b/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;
+}