From d771955ad3239eea24a2b7e7304f330d89090153 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 17 Sep 2015 02:52:35 -0700
Subject: [PATCH] Fix #186

---
 src/dfmt/formatter.d         | 10 +++++++---
 tests/allman/issue0186.d.ref | 29 +++++++++++++++++++++++++++++
 tests/issue0186.d            | 29 +++++++++++++++++++++++++++++
 tests/otbs/issue0186.d.ref   | 23 +++++++++++++++++++++++
 4 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 tests/allman/issue0186.d.ref
 create mode 100644 tests/issue0186.d
 create mode 100644 tests/otbs/issue0186.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 0cb39d7..d58f27b 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -1149,7 +1149,7 @@ private:
                     indentLevel = indents.indentToMostRecent(tok!"{");
                     indents.pop();
                 }
-                while (indents.topIsTemp() && ((indents.top != tok!"if"
+                while (sBraceDepth == 0 && indents.topIsTemp() && ((indents.top != tok!"if"
                         && indents.top != tok!"version") || !peekIs(tok!"else")))
                 {
                     indents.pop();
@@ -1181,9 +1181,9 @@ private:
             }
             else
             {
-                while (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}", tok!";")
+                if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}", tok!";")
                         && indents.top != tok!";"))
-                    indents.pop();
+                    indents.popTempIndents();
                 indentLevel = indents.indentLevel;
             }
             indent();
@@ -1240,18 +1240,22 @@ private:
     {
         import dfmt.editorconfig : IndentStyle;
         if (config.indent_style == IndentStyle.tab)
+        {
             foreach (i; 0 .. indentLevel)
             {
                 currentLineLength += config.tab_width;
                 output.put("\t");
             }
+        }
         else
+        {
             foreach (i; 0 .. indentLevel)
                 foreach (j; 0 .. config.indent_size)
                 {
                     output.put(" ");
                     currentLineLength++;
                 }
+        }
     }
 
     void pushWrapIndent(IdType type = tok!"")
diff --git a/tests/allman/issue0186.d.ref b/tests/allman/issue0186.d.ref
new file mode 100644
index 0000000..5f3b524
--- /dev/null
+++ b/tests/allman/issue0186.d.ref
@@ -0,0 +1,29 @@
+void functionName()
+{
+
+}
+
+void main()
+{
+    static if (true)
+    {
+        if (true && {
+            functionName();
+            functionName();
+            functionName();
+            functionName();
+            return true;
+        }())
+        {
+
+        }
+        else
+        {
+
+        }
+    }
+    else
+    {
+
+    }
+}
diff --git a/tests/issue0186.d b/tests/issue0186.d
new file mode 100644
index 0000000..0626e6c
--- /dev/null
+++ b/tests/issue0186.d
@@ -0,0 +1,29 @@
+void functionName()
+{
+
+}
+
+void main()
+{
+	static if (true)
+	{
+		if (true && {
+				functionName();
+				functionName();
+				functionName();
+				functionName();
+				return true;
+		}())
+		{
+
+		}
+	else
+		{
+
+		}
+	}
+	else
+	{
+
+	}
+}
diff --git a/tests/otbs/issue0186.d.ref b/tests/otbs/issue0186.d.ref
new file mode 100644
index 0000000..35c98e5
--- /dev/null
+++ b/tests/otbs/issue0186.d.ref
@@ -0,0 +1,23 @@
+void functionName() {
+
+}
+
+void main() {
+    static if (true) {
+        if (true && {
+            functionName();
+            functionName();
+            functionName();
+            functionName();
+            return true;
+        }()) {
+
+        }
+        else {
+
+        }
+    }
+    else {
+
+    }
+}