Merge pull request #318 from dlang-community/issue_314

Issue 314

appveyor.yml

@@ -19,18 +19,18 @@ environment:
   - DC: dmd
     DVersion: stable
     arch: x86
-  - DC: ldc
+#  - DC: ldc
-    DVersion: beta
+#    DVersion: beta
-    arch: x86
+#    arch: x86
-  - DC: ldc
+#  - DC: ldc
-    DVersion: beta
+#    DVersion: beta
-    arch: x64
+#    arch: x64
-  - DC: ldc
+#  - DC: ldc
-    DVersion: stable
+#    DVersion: stable
-    arch: x86
+#    arch: x86
-  - DC: ldc
+#  - DC: ldc
-    DVersion: stable
+#    DVersion: stable
-    arch: x64
+#    arch: x64
 
 skip_tags: false
 branches:

src/dfmt/formatter.d

@@ -841,7 +841,8 @@ private:
                 justAddedExtraNewline = true;
             }
             if (config.dfmt_brace_style == BraceStyle.otbs
-                    && peekIs(tok!"else") && !indents.topAre(tok!"static", tok!"if"))
+                    && peekIs(tok!"else") && !indents.topAre(tok!"static", tok!"if")
+                    && !indents.topIs(tok!"foreach"))
             {
                 write(" ");
                 index++;
@@ -852,7 +853,7 @@ private:
                         && !peekIs(tok!";") && !peekIs(tok!"{"))
                 {
                     index++;
-                    if (indents.topIs(tok!"static"))
+                    if (indents.topIsOneOf(tok!"static", tok!"foreach"))
                         indents.pop();
                     newline();
                 }

src/dfmt/indentation.d

@@ -159,14 +159,17 @@ struct IndentStack
         return cast(int) index;
     }
 
-    /+void dump()
+    /**
+     * Dumps the current state of the indentation stack to `stderr`. Used for debugging.
+     */
+    void dump()
     {
         import std.stdio : stderr;
         import dparse.lexer : str;
         import std.algorithm.iteration : map;
 
         stderr.writefln("\033[31m%(%s %)\033[0m", arr[0 .. index].map!(a => str(a)));
-    }+/
+    }
 
 private:
 

tests/allman/issue0314.d.ref

@@ -0,0 +1,11 @@
+void main()
+{
+    auto d = {
+        if (a)
+            foreach (b; c)
+            {
+            }
+        else
+            e();
+    };
+}

tests/issue0314.d

@@ -0,0 +1,9 @@
+void main()
+{
+	auto d = {
+		if (a)
+			foreach (b; c) { }
+		else
+			e();
+	};
+}

tests/otbs/issue0314.d.ref

@@ -0,0 +1,9 @@
+void main() {
+    auto d = {
+        if (a)
+            foreach (b; c) {
+            }
+        else
+            e();
+    };
+}