Merge pull request #542 from belka-ew/comment-before-contract

Fix comment before contract

src/dfmt/formatter.d

@@ -1192,11 +1192,13 @@ private:
                 writeParens(config.dfmt_space_after_cast == OptionalBoolean.t);
             break;
         case tok!"out":
-            if (!peekBackIs(tok!"}")
+            if (!peekBackIsSlashSlash) {
-                    && astInformation.contractLocations.canFindIndex(current.index))
+                if (!peekBackIs(tok!"}")
-                newline();
+                        && astInformation.contractLocations.canFindIndex(current.index))
-            else if (peekBackIsKeyword)
+                    newline();
-                write(" ");
+                else if (peekBackIsKeyword)
+                    write(" ");
+            }
             writeToken();
             if (!currentIs(tok!"{") && !currentIs(tok!"comment"))
                 write(" ");
@@ -1220,13 +1222,15 @@ private:
             break;
         case tok!"in":
             immutable isContract = astInformation.contractLocations.canFindIndex(current.index);
-            if (isContract)
+            if (!peekBackIsSlashSlash) {
-            {
+                if (isContract)
-                indents.popTempIndents();
+                {
-                newline();
+                    indents.popTempIndents();
+                    newline();
+                }
+                else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!"))
+                    write(" ");
             }
-            else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!"))
-                write(" ");
             writeToken();
             immutable isFunctionLit = astInformation.funLitStartLocations.canFindIndex(
                     current.index);

tests/allman/issue0451.d.ref

@@ -0,0 +1,40 @@
+class C
+{
+    abstract void f1() //
+    in (true);
+
+    abstract void f2() /* */
+    in (true);
+
+    abstract bool f3() //
+    out (r; r);
+
+    abstract bool f4() /* */
+    out (r; r);
+
+    abstract void f5() //
+    do
+    {
+    }
+
+    abstract void f6() /* */
+    do
+    {
+    }
+
+    abstract bool f7() //
+    in (true) //
+    out (r; r) //
+    do //
+    {
+        return true;
+    }
+
+    abstract bool f8() /* */
+    in (true) /* */
+    out (r; r) /* */
+    do /* */
+    {
+        return true;
+    }
+}

tests/issue0451.d

@@ -0,0 +1,40 @@
+class C
+{
+    abstract void f1() //
+    in (true);
+
+    abstract void f2() /* */
+    in (true);
+
+    abstract bool f3() //
+    out (r; r);
+
+    abstract bool f4() /* */
+    out (r; r);
+
+    abstract void f5() //
+    do
+    {
+    }
+
+    abstract void f6() /* */
+    do
+    {
+    }
+
+    abstract bool f7() //
+    in (true) //
+    out (r; r) //
+    do //
+    {
+        return true;
+    }
+
+    abstract bool f8() /* */
+    in (true) /* */
+    out (r; r) /* */
+    do /* */
+    {
+        return true;
+    }
+}

tests/otbs/issue0451.d.ref

@@ -0,0 +1,36 @@
+class C {
+    abstract void f1() //
+    in (true);
+
+    abstract void f2() /* */
+    in (true);
+
+    abstract bool f3() //
+    out (r; r);
+
+    abstract bool f4() /* */
+    out (r; r);
+
+    abstract void f5() //
+    do {
+    }
+
+    abstract void f6() /* */
+    do {
+    }
+
+    abstract bool f7() //
+    in (true) //
+    out (r; r) //
+    do //
+    {
+        return true;
+    }
+
+    abstract bool f8() /* */
+    in (true) /* */
+    out (r; r) /* */
+    do /* */ {
+        return true;
+    }
+}