From 75c3278a32fe86681d224ee25ac52821bc51b382 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 18 Jan 2016 14:06:47 -0800
Subject: [PATCH] Fix #216

---
 src/dfmt/formatter.d         | 28 ++++++++++++++++++++--------
 tests/allman/issue0074.d.ref |  2 +-
 tests/allman/issue0216.d.ref |  7 +++++++
 tests/issue0216.d            |  8 ++++++++
 tests/otbs/issue0074.d.ref   |  2 +-
 tests/otbs/issue0216.d.ref   |  5 +++++
 6 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 tests/allman/issue0216.d.ref
 create mode 100644 tests/issue0216.d
 create mode 100644 tests/otbs/issue0216.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 050d8b6..f1f717d 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -318,6 +318,8 @@ private:
         {
             immutable t = tokens[index - 1].type;
             immutable canAddNewline = currTokenLine - prevTokenEndLine < 1;
+            if (peekBackIsOperator() && !isSeparationToken(t))
+                pushWrapIndent(t);
             if (prevTokenEndLine == currTokenLine || (t == tok!")" && peekIs(tok!"{")))
                 write(" ");
             else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}"))
@@ -1047,8 +1049,7 @@ private:
         case tok!"..":
         case tok!"%":
         binary:
-            immutable bool isWrapToken = linebreakHints.canFind(index)
-                || peekIs(tok!"comment", false);
+            immutable bool isWrapToken = linebreakHints.canFind(index);
             if (config.dfmt_split_operator_at_line_end)
             {
                 if (isWrapToken)
@@ -1062,7 +1063,8 @@ private:
                 {
                     write(" ");
                     writeToken();
-                    write(" ");
+                    if (!currentIs(tok!"comment"))
+                        write(" ");
                 }
             }
             else
@@ -1071,11 +1073,15 @@ private:
                 {
                     pushWrapIndent();
                     newline();
+                    writeToken();
                 }
                 else
+                {
+                    write(" ");
+                    writeToken();
+                }
+                if (!currentIs(tok!"comment"))
                     write(" ");
-                writeToken();
-                write(" ");
             }
             break;
         default:
@@ -1500,7 +1506,7 @@ const pure @safe @nogc:
         return peekImplementation(tokenType, -1, ignoreComments);
     }
 
-    bool peekBackIsKeyword(bool ignoreComments = true) pure nothrow const @nogc @safe
+    bool peekBackIsKeyword(bool ignoreComments = true) nothrow
     {
         if (index == 0)
             return false;
@@ -1515,12 +1521,12 @@ const pure @safe @nogc:
         return isKeyword(tokens[i].type);
     }
 
-    bool peekBackIsOperator() pure nothrow const @nogc @safe
+    bool peekBackIsOperator() nothrow
     {
         return index == 0 ? false : isOperator(tokens[index - 1].type);
     }
 
-    bool peekBackIsOneOf(bool ignoreComments, IdType[] tokenTypes...)
+    bool peekBackIsOneOf(bool ignoreComments, IdType[] tokenTypes...) nothrow
     {
         if (index == 0)
             return false;
@@ -1611,6 +1617,12 @@ const pure @safe @nogc:
         auto t = tokens[i + index].type;
         return isBlockHeaderToken(t);
     }
+
+    bool isSeparationToken(IdType t) nothrow
+    {
+        return t == tok!"," || t == tok!";" || t == tok!":" || t == tok!"("
+            || t == tok!")" || t == tok!"[" || t == tok!"]" || t == tok!"{" || t == tok!"}";
+    }
 }
 
 bool canFindIndex(const size_t[] items, size_t index) pure @safe @nogc
diff --git a/tests/allman/issue0074.d.ref b/tests/allman/issue0074.d.ref
index 94a4645..aec2963 100644
--- a/tests/allman/issue0074.d.ref
+++ b/tests/allman/issue0074.d.ref
@@ -2,7 +2,7 @@
 {
     with (CXTypeKind)
         return kind == CXType_FunctionNoProto || kind == CXType_FunctionProto
-            ||  // FIXME: This "hack" shouldn't be needed.
+            || // FIXME: This "hack" shouldn't be needed.
             func.resultType.isValid;
 }
 
diff --git a/tests/allman/issue0216.d.ref b/tests/allman/issue0216.d.ref
new file mode 100644
index 0000000..579f820
--- /dev/null
+++ b/tests/allman/issue0216.d.ref
@@ -0,0 +1,7 @@
+unittest
+{
+    if (something || somethingElse || // I like putting comments here for no good reason
+            thirdThing)
+    {
+    }
+}
diff --git a/tests/issue0216.d b/tests/issue0216.d
new file mode 100644
index 0000000..e70cd26
--- /dev/null
+++ b/tests/issue0216.d
@@ -0,0 +1,8 @@
+unittest
+{
+	if (something || somethingElse
+		|| // I like putting comments here for no good reason
+		thirdThing)
+	{
+	}
+}
diff --git a/tests/otbs/issue0074.d.ref b/tests/otbs/issue0074.d.ref
index e9b0ca7..3bcd4ce 100644
--- a/tests/otbs/issue0074.d.ref
+++ b/tests/otbs/issue0074.d.ref
@@ -1,7 +1,7 @@
 @property bool isFunctionType() {
     with (CXTypeKind)
         return kind == CXType_FunctionNoProto || kind == CXType_FunctionProto
-            ||  // FIXME: This "hack" shouldn't be needed.
+            || // FIXME: This "hack" shouldn't be needed.
             func.resultType.isValid;
 }
 
diff --git a/tests/otbs/issue0216.d.ref b/tests/otbs/issue0216.d.ref
new file mode 100644
index 0000000..20d86fb
--- /dev/null
+++ b/tests/otbs/issue0216.d.ref
@@ -0,0 +1,5 @@
+unittest {
+    if (something || somethingElse || // I like putting comments here for no good reason
+            thirdThing) {
+    }
+}