Print colon in AA before identifiers

src/dfmt/formatter.d

@@ -805,6 +805,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 +843,6 @@ private:
             }
             else
             {
-                const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem;
-
-                if (inAA && !config.dfmt_space_before_aa_colon)
-                    write(": ");
-                else
                 write(" : ");
                 index++;
             }

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/issue0501.d.ref

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

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/issue0501.d

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

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/issue0501.d.ref

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