From bf560241541383ad2ff9c4fb3763566216495a22 Mon Sep 17 00:00:00 2001
From: Daniel Zuncke <daniel.zuncke@gmail.com>
Date: Sat, 3 Feb 2024 22:50:51 +0100
Subject: [PATCH] Issue 586: Fix indentation for named arguments

Indentation is wrong if named arguments come after newline.
---
 src/dfmt/formatter.d | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 0f7e821..0dfdbbb 100644
--- a/src/dfmt/formatter.d
+++ b/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,24 @@ 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 an index that is out of bounds.
+     +/
+    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;
+    }
+
     /// Bugs: not unicode correct
     size_t tokenEndLine(const Token t)
     {