src/dfmt/ast_info.d

@@ -454,31 +454,14 @@ final class FormatVisitor : ASTVisitor
 
     override void visit(const FunctionCallExpression functionCall)
     {
-        visit(functionCall.arguments);
+        // Check if function has any arguments.
+        if (functionCall.arguments.namedArgumentList is null)
+        {
             functionCall.accept(this);
-    }
-
-    override void visit(const NewExpression newCall)
-    {
-        visit(newCall.arguments);
-        newCall.accept(this);
-    }
-
-    override void visit(const NewAnonClassExpression newAnonClassCall)
-    {
-        visit(newAnonClassCall.constructorArguments);
-        newAnonClassCall.accept(this);
-    }
-
-    private void visit(const Arguments arguments)
-    {
-        // Check if call has any arguments.
-        if (!arguments || arguments.namedArgumentList is null)
-        {
             return;
         }
 
-        foreach (item; arguments.namedArgumentList.items)
+        foreach (item; functionCall.arguments.namedArgumentList.items)
         {
             // Do nothing if not a named argument.
             if (item.name == tok!"")
@@ -496,6 +479,8 @@ final class FormatVisitor : ASTVisitor
                 }
             }
         }
+
+        functionCall.accept(this);
     }
 
 private:

src/dfmt/formatter.d

@@ -1783,8 +1783,6 @@ private:
 
         if (hasCurrent)
         {
-            const isNamedArg = index + 1 < tokens.length
-                && astInformation.namedArgumentColonLocations.canFindIndex(tokens[index + 1].index);
             if (currentIs(tok!"else"))
             {
                 immutable i = indents.indentToMostRecent(tok!"if");
@@ -1793,7 +1791,7 @@ private:
                 if (mostRecent != -1)
                     indentLevel = mostRecent;
             }
-            else if (currentIs(tok!"identifier") && peekIs(tok!":") && !isNamedArg)
+            else if (currentIs(tok!"identifier") && peekIs(tok!":"))
             {
                 if (peekBackIs(tok!"}", true) || peekBackIs(tok!";", true))
                     indents.popTempIndents();

tests/allman/issue0586.d.ref

@@ -26,13 +26,3 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
-
-void test()
-{
-    return Struct(foo: field.foo, bar: field.bar, baz: field.baz);
-    return new Class(foo: field.foo, bar: field.bar, baz: field.baz);
-    // anonymous class
-    return new class(foo: field.foo, bar: field.bar, baz: field.baz) Class
-    {
-    };
-}

tests/issue0586.d

@@ -29,19 +29,3 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
-
-void test() {
-    return Struct(
-        foo: field.foo,
-        bar: field.bar,
-        baz: field.baz);
-    return new Class(
-        foo: field.foo,
-        bar: field.bar,
-        baz: field.baz);
-    // anonymous class
-    return new class(
-        foo: field.foo,
-        bar: field.bar,
-        baz: field.baz) Class { };
-}

tests/knr/issue0586.d.ref

@@ -25,12 +25,3 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
-
-void test()
-{
-    return Struct(foo: field.foo, bar: field.bar, baz: field.baz);
-    return new Class(foo: field.foo, bar: field.bar, baz: field.baz);
-    // anonymous class
-    return new class(foo: field.foo, bar: field.bar, baz: field.baz) Class {
-    };
-}

tests/otbs/issue0586.d.ref

@@ -22,11 +22,3 @@ void main() {
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
-
-void test() {
-    return Struct(foo: field.foo, bar: field.bar, baz: field.baz);
-    return new Class(foo: field.foo, bar: field.bar, baz: field.baz);
-    // anonymous class
-    return new class(foo: field.foo, bar: field.bar, baz: field.baz) Class {
-    };
-}