From 47a972693de634dc5d6669c1c70af7360fd8aa75 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 10 Aug 2015 16:19:43 -0700
Subject: [PATCH] Fix #162

---
 src/dfmt/formatter.d         | 6 ++++++
 tests/allman/issue0162.d.ref | 8 ++++++++
 tests/issue0162.d            | 8 ++++++++
 tests/otbs/issue0162.d.ref   | 8 ++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 tests/allman/issue0162.d.ref
 create mode 100644 tests/issue0162.d
 create mode 100644 tests/otbs/issue0162.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 0751ab7..364a229 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -310,7 +310,13 @@ private:
                     write(" ");
             }
             else if (!currentIs(tok!"{"))
+            {
+                if (currentIs(tok!")") && indents.topIs(tok!","))
+                    indents.pop();
+                else if (peekBack2Is(tok!",") && !indents.topIs(tok!","))
+                    indents.push(tok!",");
                 newline();
+            }
         }
         else
             newline();
diff --git a/tests/allman/issue0162.d.ref b/tests/allman/issue0162.d.ref
new file mode 100644
index 0000000..6d43b37
--- /dev/null
+++ b/tests/allman/issue0162.d.ref
@@ -0,0 +1,8 @@
+void foo(int foobarbazqux1, /*  */
+    int foobarbazqux2, /*  */
+    int foobarbazqux3, /*  */
+    int foobarbazqux4, /*  */
+    int foobarbazqux5, /*  */
+    int foobarbazqux6, /*  */
+    int foobarbazqux7 /* */
+);
diff --git a/tests/issue0162.d b/tests/issue0162.d
new file mode 100644
index 0000000..f606f8b
--- /dev/null
+++ b/tests/issue0162.d
@@ -0,0 +1,8 @@
+void foo(int foobarbazqux1, /*  */
+	int foobarbazqux2, /*  */
+	int foobarbazqux3, /*  */
+	int foobarbazqux4, /*  */
+	int foobarbazqux5, /*  */
+	int foobarbazqux6, /*  */
+	int foobarbazqux7 /* */
+);
diff --git a/tests/otbs/issue0162.d.ref b/tests/otbs/issue0162.d.ref
new file mode 100644
index 0000000..6d43b37
--- /dev/null
+++ b/tests/otbs/issue0162.d.ref
@@ -0,0 +1,8 @@
+void foo(int foobarbazqux1, /*  */
+    int foobarbazqux2, /*  */
+    int foobarbazqux3, /*  */
+    int foobarbazqux4, /*  */
+    int foobarbazqux5, /*  */
+    int foobarbazqux6, /*  */
+    int foobarbazqux7 /* */
+);