From d100c40dab74116c1ad675614a14e75f6928d18c Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sun, 23 Aug 2020 14:51:17 +0200
Subject: [PATCH] Print colon in AA before identifiers

---
 src/dfmt/formatter.d         | 12 ++++++------
 tests/allman/issue0465.d.ref |  8 ++++++++
 tests/allman/issue0485.d.ref |  5 +++++
 tests/allman/issue0501.d.ref |  4 ++++
 tests/issue0465.d            |  9 +++++++++
 tests/issue0485.args         |  1 +
 tests/issue0485.d            |  5 +++++
 tests/issue0501.d            |  4 ++++
 tests/otbs/issue0465.d.ref   |  7 +++++++
 tests/otbs/issue0485.d.ref   |  4 ++++
 tests/otbs/issue0501.d.ref   |  3 +++
 11 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 tests/allman/issue0465.d.ref
 create mode 100644 tests/allman/issue0485.d.ref
 create mode 100644 tests/allman/issue0501.d.ref
 create mode 100644 tests/issue0465.d
 create mode 100644 tests/issue0485.args
 create mode 100644 tests/issue0485.d
 create mode 100644 tests/issue0501.d
 create mode 100644 tests/otbs/issue0465.d.ref
 create mode 100644 tests/otbs/issue0485.d.ref
 create mode 100644 tests/otbs/issue0501.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 5d64c68..ca8641f 100644
--- a/src/dfmt/formatter.d
+++ b/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,12 +843,7 @@ private:
             }
             else
             {
-                const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem;
-
-                if (inAA && !config.dfmt_space_before_aa_colon)
-                    write(": ");
-                else
-                    write(" : ");
+                write(" : ");
                 index++;
             }
         }
diff --git a/tests/allman/issue0465.d.ref b/tests/allman/issue0465.d.ref
new file mode 100644
index 0000000..b28f284
--- /dev/null
+++ b/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;
+}
diff --git a/tests/allman/issue0485.d.ref b/tests/allman/issue0485.d.ref
new file mode 100644
index 0000000..037932e
--- /dev/null
+++ b/tests/allman/issue0485.d.ref
@@ -0,0 +1,5 @@
+void main()
+{
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}
diff --git a/tests/allman/issue0501.d.ref b/tests/allman/issue0501.d.ref
new file mode 100644
index 0000000..8f1cf11
--- /dev/null
+++ b/tests/allman/issue0501.d.ref
@@ -0,0 +1,4 @@
+void main()
+{
+    auto aa = ["aaa": 1, "bbb": 2];
+}
diff --git a/tests/issue0465.d b/tests/issue0465.d
new file mode 100644
index 0000000..e3026ea
--- /dev/null
+++ b/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;
+}
diff --git a/tests/issue0485.args b/tests/issue0485.args
new file mode 100644
index 0000000..1b0d2ce
--- /dev/null
+++ b/tests/issue0485.args
@@ -0,0 +1 @@
+--space_before_aa_colon true
diff --git a/tests/issue0485.d b/tests/issue0485.d
new file mode 100644
index 0000000..037932e
--- /dev/null
+++ b/tests/issue0485.d
@@ -0,0 +1,5 @@
+void main()
+{
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}
diff --git a/tests/issue0501.d b/tests/issue0501.d
new file mode 100644
index 0000000..8ab0e10
--- /dev/null
+++ b/tests/issue0501.d
@@ -0,0 +1,4 @@
+void main()
+{
+    auto aa = ["aaa": 1, "bbb":2];
+}
diff --git a/tests/otbs/issue0465.d.ref b/tests/otbs/issue0465.d.ref
new file mode 100644
index 0000000..e20c47f
--- /dev/null
+++ b/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;
+}
diff --git a/tests/otbs/issue0485.d.ref b/tests/otbs/issue0485.d.ref
new file mode 100644
index 0000000..058d065
--- /dev/null
+++ b/tests/otbs/issue0485.d.ref
@@ -0,0 +1,4 @@
+void main() {
+    int a;
+    int[int] hashmap = [a : a, a : a, a : a];
+}
diff --git a/tests/otbs/issue0501.d.ref b/tests/otbs/issue0501.d.ref
new file mode 100644
index 0000000..675401d
--- /dev/null
+++ b/tests/otbs/issue0501.d.ref
@@ -0,0 +1,3 @@
+void main() {
+    auto aa = ["aaa": 1, "bbb": 2];
+}