From 1bfaa7ad7a4747d1ca8aa3bebcdbb3eb57550add Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 16 Mar 2015 16:28:47 -0700
Subject: [PATCH] Fix #109

---
 src/dfmt.d                   | 19 ++++++++++++-------
 tests/allman/issue0109.d.ref |  7 +++++++
 tests/issue0109.d            |  7 +++++++
 tests/otbs/issue0109.d.ref   |  5 +++++
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 tests/allman/issue0109.d.ref
 create mode 100644 tests/issue0109.d
 create mode 100644 tests/otbs/issue0109.d.ref

diff --git a/src/dfmt.d b/src/dfmt.d
index 241936f..1edde17 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -502,16 +502,20 @@ private:
     {
         if (parenDepth > 0)
         {
-            if (linebreakHints.canFindIndex(index))
+            if (currentLineLength > config.columnSoftLimit)
             {
                 writeToken();
+                pushWrapIndent(tok!";");
                 newline();
             }
-            else if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}")))
-                write("; ");
             else
-                write(";");
-            index++;
+            {
+                if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}")))
+                    write("; ");
+                else
+                    write(";");
+                index++;
+            }
         }
         else
         {
@@ -1203,8 +1207,9 @@ private:
             }
             else
             {
-                while ((peekBackIs(tok!"}", true) || peekBackIs(tok!";", true))
-                        && indents.length && isTempIndent(indents.top()))
+                while (indents.length && (peekBackIs(tok!"}", true)
+                        || (peekBackIs(tok!";", true) && indents.top != tok!";"))
+                        && isTempIndent(indents.top()))
                 {
                     indents.pop();
                 }
diff --git a/tests/allman/issue0109.d.ref b/tests/allman/issue0109.d.ref
new file mode 100644
index 0000000..46362b2
--- /dev/null
+++ b/tests/allman/issue0109.d.ref
@@ -0,0 +1,7 @@
+unittest
+{
+    sourceLoop: for (; childCodes.length > 0 && sourceListStore.iterIsValid(sourceIter);
+            sourceListStore.iterNext(sourceIter))
+    {
+    }
+}
diff --git a/tests/issue0109.d b/tests/issue0109.d
new file mode 100644
index 0000000..bfe6d75
--- /dev/null
+++ b/tests/issue0109.d
@@ -0,0 +1,7 @@
+unittest
+{
+	sourceLoop: for (; childCodes.length > 0 && sourceListStore.iterIsValid(sourceIter); sourceListStore.iterNext(
+			sourceIter))
+	{
+	}
+}
diff --git a/tests/otbs/issue0109.d.ref b/tests/otbs/issue0109.d.ref
new file mode 100644
index 0000000..43e04fc
--- /dev/null
+++ b/tests/otbs/issue0109.d.ref
@@ -0,0 +1,5 @@
+unittest {
+    sourceLoop: for (; childCodes.length > 0 && sourceListStore.iterIsValid(sourceIter);
+            sourceListStore.iterNext(sourceIter)) {
+    }
+}