Merge branch 'master' of https://github.com/dlang-community/dfmt into master

src/dfmt/formatter.d

@@ -713,13 +713,13 @@ private:
         {
             writeToken();
             if (spaceAfterParens || parenDepth > 0)
-                write(" ");
+                writeSpace();
         }
         else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens
                 && !peekIs(tok!"in") && !peekIs(tok!"is") && !peekIs(tok!"if"))
         {
             writeToken();
-            write(" ");
+            writeSpace();
         }
         else
             writeToken();
@@ -769,14 +769,7 @@ private:
                 || currentIs(tok!"identifier"))
                 && !currentIsIndentedTemplateConstraint())
         {
-            if (onNextLine)
+            writeSpace();
-            {
-                newline();
-            }
-            else
-            {
-                write(" ");
-            }
         }
     }
 
@@ -805,6 +798,11 @@ private:
                 newline();
             }
         }
+        else if (indents.topIs(tok!"]")) // Associative array
+        {
+            write(config.dfmt_space_before_aa_colon ? " : " : ": ");
+            ++index;
+        }
         else if (peekBackIs(tok!"identifier")
                 && [tok!"{", tok!"}", tok!";", tok!":", tok!","]
                 .any!((ptrdiff_t token) => peekBack2Is(cast(IdType)token, true))
@@ -838,11 +836,6 @@ private:
             }
             else
             {
-                const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem;
-
-                if (inAA && !config.dfmt_space_before_aa_colon)
-                    write(": ");
-                else
                 write(" : ");
                 index++;
             }
@@ -1289,14 +1282,7 @@ private:
         default:
             if (peekBackIs(tok!"identifier"))
             {
-                if (onNextLine)
+                writeSpace();
-                {
-                    newline();
-                }
-                else
-                {
-                    write(" ");
-                }
             }
             if (index + 1 < tokens.length)
             {
@@ -1310,14 +1296,7 @@ private:
                     writeToken();
                     if (!currentIsIndentedTemplateConstraint())
                     {
-                        if (onNextLine)
+                        writeSpace();
-                        {
-                            newline();
-                        }
-                        else
-                        {
-                            write(" ");
-                        }
                     }
                 }
             }
@@ -1427,7 +1406,7 @@ private:
             {
                 pushWrapIndent();
                 newline();
-                if (ufcsWrap)
+                if (ufcsWrap || onNextLine)
                     regenLineBreakHints(index);
             }
             writeToken();
@@ -1943,6 +1922,18 @@ private:
             indents.push(type, detail);
     }
 
+    void writeSpace()
+    {
+        if (onNextLine)
+        {
+            newline();
+        }
+        else
+        {
+            write(" ");
+        }
+    }
+
 const pure @safe @nogc:
 
     size_t expressionEndIndex(size_t i, bool matchComma = false) nothrow

tests/allman/issue0465.d.ref

@@ -0,0 +1,8 @@
+bool asdf(const string owner, const string mail) @safe
+{
+    requestHTTP(url, (scope HTTPClientRequest request) {
+        request.writeFormBody([owner: owner, mail: mail]);
+    }, (scope HTTPClientResponse response) {});
+
+    return true;
+}

tests/allman/issue0485.d.ref

@@ -0,0 +1,5 @@
+void main()
+{
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}

tests/allman/issue0486.d.ref

@@ -0,0 +1,5 @@
+void main()
+{
+    auto someAutoVariableName = this.firstLink.secondLink
+        .filter!(shouldBeProbablySomeIdentifierOrNot);
+}

tests/allman/issue0501.d.ref

@@ -0,0 +1,4 @@
+void main()
+{
+    auto aa = ["aaa": 1, "bbb": 2];
+}

tests/allman/issue0504.d.ref

@@ -0,0 +1,40 @@
+deprecated("foo")
+void test()
+{
+}
+
+package(foo)
+void bar()
+{
+}
+
+@uda()
+void baz()
+{
+}
+
+deprecated
+deprecated_()
+{
+}
+
+@uda
+void uda_()
+{
+}
+
+@property
+void property()
+{
+}
+
+deprecated("Reason") @uda
+void propertyuda()
+{
+}
+
+deprecated("Reason")
+@uda
+void udaproperty()
+{
+}

tests/issue0465.d

@@ -0,0 +1,9 @@
+bool asdf(const string owner, const string mail) @safe
+{
+    requestHTTP(url, (scope HTTPClientRequest request) {
+        request.writeFormBody([owner: owner, mail:
+                mail]);
+    }, (scope HTTPClientResponse response) {});
+
+    return true;
+}

tests/issue0485.args

@@ -0,0 +1 @@
+--space_before_aa_colon true

tests/issue0485.d

@@ -0,0 +1,5 @@
+void main()
+{
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}

tests/issue0486.args

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

tests/issue0486.d

@@ -0,0 +1,5 @@
+void main()
+{
+    auto someAutoVariableName = this.firstLink.secondLink
+        .filter!(shouldBeProbablySomeIdentifierOrNot);
+}

tests/issue0501.d

@@ -0,0 +1,4 @@
+void main()
+{
+    auto aa = ["aaa": 1, "bbb":2];
+}

tests/issue0504.args

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

tests/issue0504.d

@@ -0,0 +1,40 @@
+deprecated("foo")
+void test()
+{
+}
+
+package(foo)
+void bar()
+{
+}
+
+@uda()
+void baz()
+{
+}
+
+deprecated
+deprecated_()
+{
+}
+
+@uda
+void uda_()
+{
+}
+
+@property
+void property()
+{
+}
+
+deprecated("Reason") @uda
+void propertyuda()
+{
+}
+
+deprecated("Reason")
+@uda
+void udaproperty()
+{
+}

tests/otbs/issue0465.d.ref

@@ -0,0 +1,7 @@
+bool asdf(const string owner, const string mail) @safe {
+    requestHTTP(url, (scope HTTPClientRequest request) {
+        request.writeFormBody([owner: owner, mail: mail]);
+    }, (scope HTTPClientResponse response) {});
+
+    return true;
+}

tests/otbs/issue0485.d.ref

@@ -0,0 +1,4 @@
+void main() {
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}

tests/otbs/issue0486.d.ref

@@ -0,0 +1,4 @@
+void main() {
+    auto someAutoVariableName = this.firstLink.secondLink
+        .filter!(shouldBeProbablySomeIdentifierOrNot);
+}

tests/otbs/issue0501.d.ref

@@ -0,0 +1,3 @@
+void main() {
+    auto aa = ["aaa": 1, "bbb": 2];
+}

tests/otbs/issue0504.d.ref

@@ -0,0 +1,32 @@
+deprecated("foo")
+void test() {
+}
+
+package(foo)
+void bar() {
+}
+
+@uda()
+void baz() {
+}
+
+deprecated
+deprecated_() {
+}
+
+@uda
+void uda_() {
+}
+
+@property
+void property() {
+}
+
+deprecated("Reason") @uda
+void propertyuda() {
+}
+
+deprecated("Reason")
+@uda
+void udaproperty() {
+}