Fix #139

libdparse

@@ -1 +1 @@
-Subproject commit f0bb347b9aa9f9cb487531debc67c91057d602aa
+Subproject commit 256b979f3b53c3367b6556c5b68e9cc76ceaf391

src/dfmt/ast_info.d

@@ -26,7 +26,9 @@ struct ASTInformation
         sort(funLitStartLocations);
         sort(funLitEndLocations);
         sort(conditionalWithElseLocations);
+        sort(conditionalStatementLocations);
         sort(arrayStartLocations);
+        sort(contractLocations);
     }
 
     /// Locations of end braces for struct bodies
@@ -64,6 +66,9 @@ struct ASTInformation
 
     /// Locations of start locations of array initializers
     size_t[] arrayStartLocations;
+
+    /// Locations of "in" and "out" tokens that begin contracts
+    size_t[] contractLocations;
 }
 
 /// Collects information from the AST that is useful for the formatter
@@ -212,6 +217,18 @@ final class FormatVisitor : ASTVisitor
         attributeDeclaration.accept(this);
     }
 
+    override void visit(const InStatement inStatement)
+    {
+        astInformation.contractLocations ~= inStatement.inTokenLocation;
+        inStatement.accept(this);
+    }
+
+    override void visit(const OutStatement outStatement)
+    {
+        astInformation.contractLocations ~= outStatement.outTokenLocation;
+        outStatement.accept(this);
+    }
+
 private:
     ASTInformation* astInformation;
     alias visit = ASTVisitor.visit;

src/dfmt/formatter.d

@@ -663,6 +663,15 @@ private:
             if (currentIs(tok!"("))
                 writeParens(config.dfmt_space_after_cast == OptionalBoolean.t);
             break;
+        case tok!"out":
+            if (!peekBackIs(tok!"}") && astInformation.contractLocations.canFindIndex(current.index))
+                newline();
+            else if (peekBackIsKeyword)
+                write(" ");
+            writeToken();
+            if (!currentIs(tok!"(") && !currentIs(tok!"{"))
+                write(" ");
+            break;
         case tok!"try":
             if (peekIs(tok!"{"))
                 writeToken();
@@ -674,8 +683,17 @@ private:
             }
             break;
         case tok!"in":
+            auto isContract = astInformation.contractLocations.canFindIndex(current.index);
+            if (isContract)
+                newline();
+            else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!"))
+                write(" ");
+            writeToken();
+            if (!isContract)
+                write(" ");
+            break;
         case tok!"is":
-            if (!peekBackIsOneOf(false, tok!"!", tok!"(", tok!","))
+            if (!peekBackIsOneOf(false, tok!"!", tok!"(", tok!",", tok!"}") && !peekBackIsKeyword())
                 write(" ");
             writeToken();
             if (!currentIs(tok!"(") && !currentIs(tok!"{"))
@@ -695,7 +713,7 @@ private:
         default:
             if (index + 1 < tokens.length)
             {
-                if (!peekIs(tok!"@") && peekIsOperator())
+                if (!peekIs(tok!"@") && (peekIsOperator() || peekIs(tok!"out") || peekIs(tok!"in")))
                     writeToken();
                 else
                 {

tests/allman/issue0139.d.ref

@@ -0,0 +1,32 @@
+void foo(auto in a, auto out int b) const
+out
+{
+    assert(true);
+}
+body
+{
+}
+
+void foo() const
+in
+{
+}
+out
+{
+    assert(true);
+}
+body
+{
+}
+
+void foo() const
+in
+{
+}
+out (result)
+{
+    assert(true);
+}
+body
+{
+}

tests/issue0139.d

@@ -0,0 +1,32 @@
+void foo(auto in a, auto out int b) const
+out
+{
+	assert(true);
+}
+body
+{
+}
+
+void foo() const
+in
+{
+}
+out
+{
+	assert(true);
+}
+body
+{
+}
+
+void foo() const
+in
+{
+}
+out (result)
+{
+	assert(true);
+}
+body
+{
+}

tests/otbs/issue0139.d.ref

@@ -0,0 +1,24 @@
+void foo(auto in a, auto out int b) const
+out {
+    assert(true);
+}
+body {
+}
+
+void foo() const
+in {
+}
+out {
+    assert(true);
+}
+body {
+}
+
+void foo() const
+in {
+}
+out (result) {
+    assert(true);
+}
+body {
+}