More formatting fixes

libdparse

@@ -1 +1 @@
-Subproject commit f73bed9279602a228933b21156d8f1f2ec5e4fdd
+Subproject commit 6ac2d819363eacb3cec334e9a6f3c10dfc8bb280

src/dfmt.d

@@ -75,6 +75,7 @@ int main(string[] args)
     else
     {
         import std.file : dirEntries, isDir, SpanMode;
+
         if (args.length >= 2)
             inplace = true;
         while (args.length > 0)
@@ -270,7 +271,8 @@ private:
         }
         else if (current.type == tok!"for" || current.type == tok!"foreach"
             || current.type == tok!"foreach_reverse" || current.type == tok!"while"
-            || current.type == tok!"if")
+            || current.type == tok!"if" || current.type == tok!"out"
+            || current.type == tok!"catch")
         {
             currentLineLength += currentTokenLength() + 1;
             writeToken();
@@ -300,7 +302,8 @@ private:
                     auto next = tokens[index + 1];
                     if (next.type == tok!";" || next.type == tok!"("
                         || next.type == tok!")" || next.type == tok!","
-                        || next.type == tok!"{" || next.type == tok!".")
+                        || next.type == tok!"{" || next.type == tok!"."
+                        || next.type == tok!":")
                     {
                         writeToken();
                     }
@@ -358,8 +361,18 @@ private:
                 writeToken();
                 break;
             case tok!":":
+                if (!assumeSorted(astInformation.attributeDeclarationLines)
+                    .equalRange(current.line).empty)
+                {
+                    writeToken();
+                    tempIndent = 0;
+                    newline();
+                }
+                else
+                {
                     write(" : ");
                     index += 1;
+                }
                 break;
             case tok!"]":
                 writeToken();
@@ -544,7 +557,7 @@ private:
                 depth--;
                 if (index < tokens.length - 1 &&
                     assumeSorted(astInformation.doubleNewlineLocations)
-                    .equalRange(tokens[index].index).length)
+                    .equalRange(tokens[index].index).length && !peekIs(tok!"}"))
                 {
                     output.put("\n");
                 }
@@ -601,14 +614,31 @@ private:
             }
             else if (current.type == tok!")")
             {
-                if (peekIs(tok!"identifier") || (index + 1 < tokens.length
+                if (peekIs(tok!"identifier"))
-                    && (isKeyword(tokens[index + 1].type)
-                     || tokens[index + 1].type == tok!"@")))
                 {
                     writeToken();
                     if (space_afterwards)
                     write(" ");
                 }
+                else if (index + 1 < tokens.length)
+                {
+                    if (tokens[index + 1].type == tok!"in"
+                        || tokens[index + 1].type == tok!"out"
+                        || tokens[index + 1].type == tok!"body")
+                    {
+                        writeToken();
+                        newline();
+                    }
+                    else if (isKeyword(tokens[index + 1].type)
+                        || tokens[index + 1].type == tok!"@")
+                    {
+                        writeToken();
+                        if (space_afterwards)
+                            write(" ");
+                    }
+                    else
+                        writeToken();
+                }
                 else
                     writeToken();
                 depth--;
@@ -753,12 +783,18 @@ private:
 
     void newline()
     {
+        import std.range:assumeSorted;
         output.put("\n");
         currentLineLength = 0;
         if (index < tokens.length)
         {
             if (current.type == tok!"}")
                 indentLevel--;
+            else if (!assumeSorted(astInformation.attributeDeclarationLines)
+                .equalRange(current.line).empty)
+            {
+                tempIndent--;
+            }
             indent();
         }
     }
@@ -864,7 +900,7 @@ struct ASTInformation
         sort(doubleNewlineLocations);
         sort(spaceAfterLocations);
         sort(unaryLocations);
-        sort(ternaryColonLocations);
+        sort(attributeDeclarationLines);
     }
 
     /// Locations of end braces for struct bodies
@@ -876,8 +912,8 @@ struct ASTInformation
     /// Locations of unary operators
     size_t[] unaryLocations;
 
-    /// Locations of ':' operators in ternary expressions
+    /// Lines containing attribute declarations
-    size_t[] ternaryColonLocations;
+    size_t[] attributeDeclarationLines;
 }
 
 /// Collects information from the AST that is useful for the formatter
@@ -893,10 +929,6 @@ final class FormatVisitor : ASTVisitor
     {
         if (functionBody.blockStatement !is null)
             astInformation.doubleNewlineLocations ~= functionBody.blockStatement.endLocation;
-        if (functionBody.inStatement !is null && functionBody.inStatement.blockStatement !is null)
-            astInformation.doubleNewlineLocations ~= functionBody.inStatement.blockStatement.endLocation;
-        if (functionBody.outStatement !is null && functionBody.outStatement.blockStatement !is null)
-            astInformation.doubleNewlineLocations ~= functionBody.outStatement.blockStatement.endLocation;
         if (functionBody.bodyStatement !is null && functionBody.bodyStatement.blockStatement !is null)
             astInformation.doubleNewlineLocations ~= functionBody.bodyStatement.blockStatement.endLocation;
         functionBody.accept(this);
@@ -950,11 +982,10 @@ final class FormatVisitor : ASTVisitor
         unary.accept(this);
     }
 
-    override void visit(const TernaryExpression ternary)
+    override void visit(const AttributeDeclaration attributeDeclaration)
     {
-        if (ternary.colon.type != tok!"")
+        astInformation.attributeDeclarationLines ~= attributeDeclaration.line;
-            astInformation.ternaryColonLocations ~= ternary.colon.index;
+        attributeDeclaration.accept(this);
-        ternary.accept(this);
     }
 
 private:

tests/catchExceptionNested.d.ref

@@ -4,7 +4,6 @@ class U0 : Exception
     {
         super("U0 error message");
     }
-
 }
 
 class U1 : Exception
@@ -13,7 +12,6 @@ class U1 : Exception
     {
         super("U1 error message");
     }
-
 }
 
 void foo()

tests/contracts.d

@@ -0,0 +1,13 @@
+void main(string[] args)
+{
+    struct SomeStruct {
+    private:
+int a; int b;
+        void doStuff(int q)
+        in {
+            assert(q);
+        } out (result) {}
+        body
+        {
+writeln(q);
+        }}}

tests/contracts.d.ref

@@ -0,0 +1,21 @@
+void main(string[] args)
+{
+    struct SomeStruct
+    {
+    private:
+        int a;
+        int b;
+        void doStuff(int q)
+        in
+        {
+            assert(q);
+        }
+        out (result)
+        {
+        }
+        body
+        {
+            writeln(q);
+        }
+    }
+}