Fix #118

src/dfmt.d

@@ -601,7 +601,8 @@ private:
         else
         {
             // Silly hack to format enums better.
-			if (peekBackIsLiteralOrIdent() || (peekBackIs(tok!",", true) && !peekBackIsSlashSlash))
+            if (peekBackIsLiteralOrIdent() || peekBackIs(tok!")", true)
+                    ||(peekBackIs(tok!",", true) && !peekBackIsSlashSlash))
                 newline();
             write("}");
             if (index < tokens.length - 1
@@ -746,8 +747,8 @@ private:
         case tok!"~":
             if (peekIs(tok!"this"))
             {
-				if (!(index == 0 || peekBackIs(tok!"{", true) || peekBackIs(tok!"}", true)
+                if (!(index == 0 || peekBackIs(tok!"{", true)
-						|| peekBackIs(tok!";", true)))
+                        || peekBackIs(tok!"}", true) || peekBackIs(tok!";", true)))
                 {
                     write(" ");
                 }
@@ -882,7 +883,8 @@ private:
         import std.algorithm : canFind;
 
         regenLineBreakHintsIfNecessary(index);
-		if (indents.indentToMostRecent(tok!"enum") != -1 && !peekIs(tok!"}"))
+        if (indents.indentToMostRecent(tok!"enum") != -1 && !peekIs(tok!"}")
+                && indents.top == tok!"{" && parenDepth == 0)
         {
             writeToken();
             newline();

tests/allman/issue0118.d.ref

@@ -0,0 +1,16 @@
+auto foo = bar(1, 1, 1);
+auto foo = A!(int, int, int);
+enum foo = bar(1, 1, 1);
+enum foo = A!(int, int, int);
+
+enum bar
+{
+    a = Struct(a, b, c),
+    b = Struct(d, e, f)
+}
+
+enum bar
+{
+    a = Struct(a, b, c),
+    b = Struct(d, e, f),
+}

tests/issue0118.d

@@ -0,0 +1,16 @@
+auto foo = bar(1, 1, 1);
+auto foo = A!(int, int, int);
+enum foo = bar(1, 1, 1);
+enum foo = A!(int, int, int);
+
+enum bar
+{
+	a = Struct(a, b, c),
+	b = Struct(d, e, f)
+}
+
+enum bar
+{
+	a = Struct(a, b, c),
+	b = Struct(d, e, f),
+}

tests/otbs/issue0118.d.ref

@@ -0,0 +1,14 @@
+auto foo = bar(1, 1, 1);
+auto foo = A!(int, int, int);
+enum foo = bar(1, 1, 1);
+enum foo = A!(int, int, int);
+
+enum bar {
+    a = Struct(a, b, c),
+    b = Struct(d, e, f)
+}
+
+enum bar {
+    a = Struct(a, b, c),
+    b = Struct(d, e, f),
+}