From 17eedb50c0cb7c3d804c0feb75205d3b23e73a3c Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 10 Aug 2015 16:37:09 -0700
Subject: [PATCH] Fix #166

---
 src/dfmt/formatter.d         | 7 ++++---
 tests/allman/issue0120.d.ref | 3 ++-
 tests/allman/issue0166.d.ref | 9 +++++++++
 tests/issue0166.d            | 7 +++++++
 tests/otbs/issue0120.d.ref   | 3 ++-
 tests/otbs/issue0166.d.ref   | 7 +++++++
 6 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 tests/allman/issue0166.d.ref
 create mode 100644 tests/issue0166.d
 create mode 100644 tests/otbs/issue0166.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 364a229..e5f9855 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -565,7 +565,7 @@ private:
 
     void formatLeftBrace()
     {
-        import std.algorithm : map, sum;
+        import std.algorithm : map, sum, canFind;
 
         if (astInformation.structInitStartLocations.canFindIndex(tokens[index].index))
         {
@@ -587,9 +587,10 @@ private:
             if (peekBackIs(tok!")"))
                 write(" ");
             auto e = expressionEndIndex(index);
+            immutable bool hasComment = tokens[index .. e].canFind!((a, b) => a.type == b)(tok!"comment");
             immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)).sum();
             writeToken();
-            if (l > config.dfmt_soft_max_line_length)
+            if (hasComment || l > config.dfmt_soft_max_line_length)
             {
                 indents.push(tok!"{");
                 newline();
@@ -662,7 +663,7 @@ private:
             write("}");
             if (index + 1 < tokens.length
                     && astInformation.doubleNewlineLocations.canFindIndex(tokens[index].index)
-                    && !peekIs(tok!"}") && !peekIs(tok!";"))
+                    && !peekIs(tok!"}") && !peekIs(tok!";") && !peekIs(tok!"comment", false))
             {
                 simpleNewline();
                 currentLineLength = 0;
diff --git a/tests/allman/issue0120.d.ref b/tests/allman/issue0120.d.ref
index a6abc51..c3b6313 100644
--- a/tests/allman/issue0120.d.ref
+++ b/tests/allman/issue0120.d.ref
@@ -1,2 +1,3 @@
-auto fun = { int i; // Comment
+auto fun = {
+    int i; // Comment
 };
diff --git a/tests/allman/issue0166.d.ref b/tests/allman/issue0166.d.ref
new file mode 100644
index 0000000..f1d209f
--- /dev/null
+++ b/tests/allman/issue0166.d.ref
@@ -0,0 +1,9 @@
+void foo()
+{ //
+    void bar()
+    { //
+        baz({ //
+            qux(); //
+        }); //
+    } //
+} //
diff --git a/tests/issue0166.d b/tests/issue0166.d
new file mode 100644
index 0000000..c2b06d4
--- /dev/null
+++ b/tests/issue0166.d
@@ -0,0 +1,7 @@
+void foo() { //
+	void bar() { //
+		baz({ //
+			qux(); //
+		}); //
+	} //
+} //
diff --git a/tests/otbs/issue0120.d.ref b/tests/otbs/issue0120.d.ref
index a6abc51..c3b6313 100644
--- a/tests/otbs/issue0120.d.ref
+++ b/tests/otbs/issue0120.d.ref
@@ -1,2 +1,3 @@
-auto fun = { int i; // Comment
+auto fun = {
+    int i; // Comment
 };
diff --git a/tests/otbs/issue0166.d.ref b/tests/otbs/issue0166.d.ref
new file mode 100644
index 0000000..7b56587
--- /dev/null
+++ b/tests/otbs/issue0166.d.ref
@@ -0,0 +1,7 @@
+void foo() { //
+    void bar() { //
+        baz({ //
+            qux(); //
+        }); //
+    } //
+} //