From f14c6e1226c7a8d088b4a5f2088b12839a9078e1 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 14 Jan 2016 16:02:24 -0800
Subject: [PATCH] Fix #207

---
 src/dfmt/formatter.d         |  3 ++-
 tests/allman/issue0207.d.ref | 11 +++++++++++
 tests/issue0207.d            |  6 ++++++
 tests/otbs/issue0207.d.ref   | 10 ++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tests/allman/issue0207.d.ref
 create mode 100644 tests/issue0207.d
 create mode 100644 tests/otbs/issue0207.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 36de9c9..cdc941b 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -347,7 +347,8 @@ private:
             {
                 if (currentIs(tok!")") && indents.topIs(tok!","))
                     indents.pop();
-                else if (peekBack2Is(tok!",") && !indents.topIs(tok!","))
+                else if (peekBack2Is(tok!",") && !indents.topIs(tok!",")
+                        && indents.indentToMostRecent(tok!"enum") == -1)
                     indents.push(tok!",");
                 newline();
             }
diff --git a/tests/allman/issue0207.d.ref b/tests/allman/issue0207.d.ref
new file mode 100644
index 0000000..c26c44a
--- /dev/null
+++ b/tests/allman/issue0207.d.ref
@@ -0,0 +1,11 @@
+enum a
+{
+    a,
+    b,
+    c,
+    d,
+    /* a comment */
+    e,
+    f,
+    g
+}
diff --git a/tests/issue0207.d b/tests/issue0207.d
new file mode 100644
index 0000000..051fb5a
--- /dev/null
+++ b/tests/issue0207.d
@@ -0,0 +1,6 @@
+enum a
+{
+    a, b, c, d,
+    /* a comment */
+    e, f, g
+}
diff --git a/tests/otbs/issue0207.d.ref b/tests/otbs/issue0207.d.ref
new file mode 100644
index 0000000..5b779d8
--- /dev/null
+++ b/tests/otbs/issue0207.d.ref
@@ -0,0 +1,10 @@
+enum a {
+    a,
+    b,
+    c,
+    d,
+    /* a comment */
+    e,
+    f,
+    g
+}