Issue #586 follow-up: Too little indentation if named arguments come after a newline

src/dfmt/formatter.d

@@ -1804,6 +1804,12 @@ private:
                     assert(l2 != -1, "Recent '{' is not found despite being in struct initializer");
                     indentLevel = l2 + 1;
                 }
+                else if (canFind(astInformation.namedArgumentColonLocations, tokens[nextNonComment(1)].index))
+                {
+                    immutable l2 = indents.indentToMostRecent(tok!"(");
+                    assert(l2 != -1, "Recent '(' is not found despite being in named function argument");
+                    indentLevel = l2 + 1;
+                }
                 else if ((config.dfmt_compact_labeled_statements == OptionalBoolean.f
                         || !isBlockHeader(2) || peek2Is(tok!"if")) && !indents.topIs(tok!"]"))
                 {
@@ -2316,6 +2322,25 @@ const pure @safe @nogc:
         return previousTokenEndLineNo < tokens[index].line;
     }
 
+    /++ 
+     + Get the index of the next token that isn't a comment starting from
+     + current index + n.
+     + If n is negative, searches backwards.
+     + If n = 0, returns index.
+     + Params:
+     +   n = Offset to index where search begins. Negative values search backwards.
+     + Returns: 
+     +   Index of next token that isn't a comment or `size_t.max` if no such
+     +   token exists,
+     +/
+    size_t nextNonComment(int n = 1)
+    {
+        size_t i = index + n;
+        while (n != 0 && i < tokens.length && tokens[i].type == tok!"comment")
+            i = n > 0 ? i + 1 : i - 1;
+        return i < tokens.length ? i : size_t.max;
+    }
+
     /// Bugs: not unicode correct
     size_t tokenEndLine(const Token t)
     {

tests/allman/issue0586.d.ref

@@ -26,3 +26,10 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
+
+void g()
+{
+    tmp(namedArg1: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg2: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg3: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc");
+}

tests/allman/issue0586_keep_line_breaks.d.ref

@@ -0,0 +1,7 @@
+void test()
+{
+    return Struct(
+        foo: field.foo,
+        bar: field.bar,
+        baz: field.baz);
+}

tests/issue0586.d

@@ -29,3 +29,10 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
+
+void g()
+{
+    tmp(namedArg1: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+namedArg2: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+namedArg3: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc");
+}

tests/issue0586_keep_line_breaks.args

@@ -0,0 +1 @@
+--keep_line_breaks true

tests/issue0586_keep_line_breaks.d

@@ -0,0 +1,7 @@
+void test()
+{
+    return Struct(
+foo: field.foo,
+bar: field.bar,
+baz: field.baz);
+}

tests/knr/issue0586.d.ref

@@ -25,3 +25,10 @@ void main()
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
+
+void g()
+{
+    tmp(namedArg1: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg2: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg3: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc");
+}

tests/knr/issue0586_keep_line_breaks.d.ref

@@ -0,0 +1,7 @@
+void test()
+{
+    return Struct(
+        foo: field.foo,
+        bar: field.bar,
+        baz: field.baz);
+}

tests/otbs/issue0586.d.ref

@@ -22,3 +22,9 @@ void main() {
 
     temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
 }
+
+void g() {
+    tmp(namedArg1: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg2: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc",
+        namedArg3: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc");
+}

tests/otbs/issue0586_keep_line_breaks.d.ref

@@ -0,0 +1,6 @@
+void test() {
+    return Struct(
+        foo: field.foo,
+        bar: field.bar,
+        baz: field.baz);
+}