From 91983ebfea5b81456660dfdd606eec5eb4dd9955 Mon Sep 17 00:00:00 2001
From: Andreas Zwinkau <qznc@web.de>
Date: Fri, 16 Jan 2015 21:54:20 +0100
Subject: [PATCH] More clever length estimating for import statements

Comma separated imports can get so long, they line breaks. Previously,
line breaks were inserted, if the identifier after "," made the line
longer than the soft limit. Now the whole expression length after ","
is calculated for the decision. For example, no line breaks within
"std.stdio" anymore.
---
 src/dfmt.d | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/dfmt.d b/src/dfmt.d
index c8c47c2..83bd5dc 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -197,6 +197,28 @@ private:
                     newline();
                     break;
                 }
+                else if (current.type == tok!",")
+                {
+                    // compute length until next , or ;
+                    int length_of_next_chunk = INVALID_TOKEN_LENGTH;
+                    for (size_t i=index+1; i<tokens.length; i++)
+                    {
+                        if (tokens[i].type == tok!"," || tokens[i].type == tok!";")
+                            break;
+                        const len = tokenLength(i);
+                        assert (len >= 0);
+                        length_of_next_chunk += len;
+                    }
+                    assert (length_of_next_chunk > 0);
+                    writeToken();
+                    if (currentLineLength+1+length_of_next_chunk >= config.columnSoftLimit)
+                    {
+                        pushIndent();
+                        newline();
+                    }
+                    else
+                        write(" ");
+                }
                 else
                     formatStep();
             }