Fix #100

dlang-community · Mar 14, 2015 · ce1c20e · ce1c20e
1 parent 0b7bc36
commit ce1c20e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/src/dfmt.d b/src/dfmt.d
@@ -307,10 +307,11 @@ private:
         else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug"))
             && peekIs(tok!"(", false))
         {
-            immutable bool shouldPushIndent = (!currentIs(tok!"version")
-                && !currentIs(tok!"debug")) || astInformation.conditionalWithElseLocations
-                .canFindIndex(current.index) || astInformation.conditionalStatementLocations.canFindIndex(
-                current.index);
+			immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug") ;
+			immutable bool b = a || astInformation.conditionalWithElseLocations
+				.canFindIndex(current.index);
+			immutable bool shouldPushIndent = b || astInformation.conditionalStatementLocations
+				.canFindIndex(current.index);
             if (shouldPushIndent)
                 indents.push(current.type);
             writeToken();
@@ -1764,7 +1765,7 @@ struct IndentStack
         foreach (i; 1 .. j + 1)
         {
             if ((i + 1 <= index && !isWrapIndent(arr[i]) && isTempIndent(arr[i])
-                && (!isTempIndent(arr[i + 1]))))
+                && (!isTempIndent(arr[i + 1]) || arr[i + 1] == tok!"switch")))
             {
                 continue;
             }

diff --git a/tests/issue0100.d b/tests/issue0100.d
@@ -0,0 +1,14 @@
+unittest
+{
+	loop: while (i < tokens.length) switch (tokens[i].type)
+		{
+		case tok!"(":
+			parenDepth++;
+			i++;
+			break;
+		case tok!"{":
+			braceDepth++;
+			i++;
+			break;
+		}
+}
diff --git a/tests/issue0100.d.ref b/tests/issue0100.d.ref
@@ -0,0 +1,14 @@
+unittest
+{
+    loop: while (i < tokens.length) switch (tokens[i].type)
+    {
+    case tok!"(":
+        parenDepth++;
+        i++;
+        break;
+    case tok!"{":
+        braceDepth++;
+        i++;
+        break;
+    }
+}