From 85c7d57167be4e6ce583d82e062e60fbcf5e1d7b Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Fri, 11 Jan 2019 00:48:59 +0100
Subject: [PATCH] make multiline checking code modular

Arrays and delegates now use the check whether a line is longer
than the max line length using easy to reuse code
---
 src/dfmt/formatter.d | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index b2716c7..c8bbe18 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -569,9 +569,9 @@ private:
         // No heuristics apply if we can't look before the opening paren/bracket
         if (index < 1)
             return;
-        immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0
+        immutable bool arrayInitializerStart = p == tok!"["
             && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
-        if (arrayInitializerStart)
+        if (arrayInitializerStart && isMultilineAt(index))
         {
             // Use the close bracket as the indent token to distinguish
             // the array initialiazer from an array index in the newline
@@ -790,12 +790,7 @@ private:
             sBraceDepth++;
             if (peekBackIsOneOf(true, tok!")", tok!"identifier"))
                 write(" ");
-            auto e = expressionEndIndex(index);
-            immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a))
-                .sum();
-            immutable bool multiline = l > config.dfmt_soft_max_line_length
-                || tokens[index .. e].canFind!(a => a.type == tok!"comment"
-                    || isBlockHeaderToken(a.type))();
+            immutable bool multiline = isMultilineAt(index);
             writeToken();
             if (multiline)
             {
@@ -1698,6 +1693,7 @@ const pure @safe @nogc:
     size_t expressionEndIndex(size_t i) nothrow
     {
         immutable bool braces = i < tokens.length && tokens[i].type == tok!"{";
+        immutable bool brackets = i < tokens.length && tokens[i].type == tok!"[";
         immutable d = depths[i];
         while (true)
         {
@@ -1705,13 +1701,23 @@ const pure @safe @nogc:
                 break;
             if (depths[i] < d)
                 break;
-            if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{"))
+            if (!braces && !brackets && (tokens[i].type == tok!";" || tokens[i].type == tok!"{"))
                 break;
             i++;
         }
         return i;
     }
 
+    bool isMultilineAt(size_t i)
+    {
+        import std.algorithm : map, sum, canFind;
+
+        auto e = expressionEndIndex(i);
+        immutable int l = currentLineLength + tokens[i .. e].map!(a => tokenLength(a)).sum();
+        return l > config.dfmt_soft_max_line_length
+            || tokens[i .. e].canFind!(a => a.type == tok!"comment" || isBlockHeaderToken(a.type))();
+    }
+
     bool peekIsKeyword() nothrow
     {
         return index + 1 < tokens.length && isKeyword(tokens[index + 1].type);