From 1ca3bd9255b06c72ff505ea01ae04dc3eed6a62f Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 29 Jan 2018 14:18:59 -0800
Subject: [PATCH] Fix #314

---
 src/dfmt/formatter.d         |  5 +++--
 tests/allman/issue0314.d.ref | 11 +++++++++++
 tests/issue0314.d            |  9 +++++++++
 tests/otbs/issue0314.d.ref   |  9 +++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 tests/allman/issue0314.d.ref
 create mode 100644 tests/issue0314.d
 create mode 100644 tests/otbs/issue0314.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 14c56d4..760b4f7 100644
--- a/src/dfmt/formatter.d
+++ b/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();
                 }
diff --git a/tests/allman/issue0314.d.ref b/tests/allman/issue0314.d.ref
new file mode 100644
index 0000000..94808e1
--- /dev/null
+++ b/tests/allman/issue0314.d.ref
@@ -0,0 +1,11 @@
+void main()
+{
+    auto d = {
+        if (a)
+            foreach (b; c)
+            {
+            }
+        else
+            e();
+    };
+}
diff --git a/tests/issue0314.d b/tests/issue0314.d
new file mode 100644
index 0000000..5b4792c
--- /dev/null
+++ b/tests/issue0314.d
@@ -0,0 +1,9 @@
+void main()
+{
+	auto d = {
+		if (a)
+			foreach (b; c) { }
+		else
+			e();
+	};
+}
diff --git a/tests/otbs/issue0314.d.ref b/tests/otbs/issue0314.d.ref
new file mode 100644
index 0000000..2f2427d
--- /dev/null
+++ b/tests/otbs/issue0314.d.ref
@@ -0,0 +1,9 @@
+void main() {
+    auto d = {
+        if (a)
+            foreach (b; c) {
+            }
+        else
+            e();
+    };
+}