From 1da1ca6545c3d8922e2c883e5c5ce6f1eb697f6e Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Fri, 11 Jan 2019 20:19:50 +0100
Subject: [PATCH] Fix isMultilineAt for array + refactor right bracket Refactor
 formatRightBracket into own function

---
 src/dfmt/formatter.d | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index a09db2b..a7ab809 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -571,7 +571,7 @@ private:
             return;
         immutable bool arrayInitializerStart = p == tok!"["
             && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
-        if (arrayInitializerStart && isMultilineAt(index))
+        if (arrayInitializerStart && isMultilineAt(index - 1))
         {
             // Use the close bracket as the indent token to distinguish
             // the array initialiazer from an array index in the newline
@@ -644,6 +644,26 @@ private:
             writeToken();
     }
 
+    void formatRightBracket()
+    in
+    {
+        assert(currentIs(tok!"]"));
+    }
+    body
+    {
+        indents.popWrapIndents();
+        if (indents.topIs(tok!"]"))
+        {
+            if (!indents.topDetails.mini)
+                newline();
+            else
+                indents.pop();
+        }
+        writeToken();
+        if (currentIs(tok!"identifier"))
+            write(" ");
+    }
+
     void formatAt()
     {
         immutable size_t atIndex = tokens[index].index;
@@ -1258,17 +1278,7 @@ private:
             formatColon();
             break;
         case tok!"]":
-            indents.popWrapIndents();
-            if (indents.topIs(tok!"]"))
-            {
-                if (!indents.topDetails.mini)
-                    newline();
-                else
-                    indents.pop();
-            }
-            writeToken();
-            if (currentIs(tok!"identifier"))
-                write(" ");
+            formatRightBracket();
             break;
         case tok!";":
             formatSemicolon();