Fix issue 578

src/dfmt/ast_info.d

@@ -63,6 +63,7 @@ struct ASTInformation
             (structInfoSortedByEndLocation);
         sort(ufcsHintLocations);
         ufcsHintLocations = ufcsHintLocations.uniq().array();
+        sort(ternaryColonLocations);
     }
 
     /// Locations of end braces for struct bodies
@@ -135,6 +136,9 @@ struct ASTInformation
 
     /// Opening & closing braces of struct initializers
     StructInitializerInfo[] structInfoSortedByEndLocation;
+
+    /// Locations ternary expression colons.
+    size_t[] ternaryColonLocations;
 }
 
 /// Collects information from the AST that is useful for the formatter
@@ -438,6 +442,11 @@ final class FormatVisitor : ASTVisitor
         outStatement.accept(this);
     }
 
+    override void visit(const TernaryExpression ternaryExpression)
+    {
+        astInformation.ternaryColonLocations ~= ternaryExpression.colon.index;
+    }
+
 private:
     ASTInformation* astInformation;
 }

src/dfmt/formatter.d

@@ -841,6 +841,7 @@ private:
                 current.line);
         immutable bool isStructInitializer = astInformation.structInfoSortedByEndLocation
             .canFind!(st => st.startLocation < current.index && current.index < st.endLocation);
+        immutable bool isTernary = astInformation.ternaryColonLocations.canFindIndex(current.index);
 
         if (isCase || isAttribute)
         {
@@ -856,7 +857,7 @@ private:
                 newline();
             }
         }
-        else if (indents.topIs(tok!"]")) // Associative array
+        else if (indents.topIs(tok!"]") && !isTernary) // Associative array
         {
             write(config.dfmt_space_before_aa_colon ? " : " : ": ");
             ++index;

tests/allman/issue0578.d.ref

@@ -0,0 +1,43 @@
+void f()
+{
+    auto t = true ? 1 : 0;
+    auto a = [true ? 1 : 0];
+    auto aa1 = [0: true ? 1 : 0];
+    auto aa2 = [0: true ? (false ? 1 : 2) : 3];
+
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+    /+
+    READ IF THIS TEST FAILS
+
+    Bug in dparse:
+    (Formatting before fix issue 578)
+    int[int] aa3 = [0: true ? false ? 1: 2: 3];
+                                       ^
+
+    EXPLANATION:
+    The marked colon is not is not recognized as a TernaryExpression by
+    dparse:
+    If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
+    ASTInformation visit function, which should get called once for every
+    encountered ternary colon, only the second index is printed:
+    override void visit(const TernaryExpression ternaryExpression) { ... }
+
+    This bug can be ignored (formatting error is localized and should be rarely
+    encountered).
+
+
+    FIX:
+    Should this get fixed by dparse or when the migration to dmd is completed,
+    the formatting in the .ref files can be updated to the correct one and this
+    comment can be removed.
+
+
+    Current formatting after applying fix issue 578:
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+                                   ^
+
+    Correct formatting after fix dparse:
+    auto aa3 = [0: true ? false ? 1 : 2 : 3];
+                                    ^
+    +/
+}

tests/issue0578.d

@@ -0,0 +1,43 @@
+void f()
+{
+    auto t = true ? 1 : 0;
+    auto a = [true ? 1: 0];
+    auto aa1 = [0: true ? 1: 0];
+    auto aa2 = [0: true ? (false ? 1: 2): 3];
+
+    auto aa3 = [0: true ? false ? 1: 2: 3];
+    /+
+    READ IF THIS TEST FAILS
+
+    Bug in dparse:
+    (Formatting before fix issue 578)
+    int[int] aa3 = [0: true ? false ? 1: 2: 3];
+                                       ^
+
+    EXPLANATION:
+    The marked colon is not is not recognized as a TernaryExpression by
+    dparse:
+    If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
+    ASTInformation visit function, which should get called once for every
+    encountered ternary colon, only the second index is printed:
+    override void visit(const TernaryExpression ternaryExpression) { ... }
+
+    This bug can be ignored (formatting error is localized and should be rarely
+    encountered).
+
+
+    FIX:
+    Should this get fixed by dparse or when the migration to dmd is completed,
+    the formatting in the .ref files can be updated to the correct one and this
+    comment can be removed.
+
+
+    Current formatting after applying fix issue 578:
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+                                   ^
+
+    Correct formatting after fix dparse:
+    auto aa3 = [0: true ? false ? 1 : 2 : 3];
+                                    ^
+    +/
+}

tests/knr/issue0578.d.ref

@@ -0,0 +1,43 @@
+void f()
+{
+    auto t = true ? 1 : 0;
+    auto a = [true ? 1 : 0];
+    auto aa1 = [0: true ? 1 : 0];
+    auto aa2 = [0: true ? (false ? 1 : 2) : 3];
+
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+    /+
+    READ IF THIS TEST FAILS
+
+    Bug in dparse:
+    (Formatting before fix issue 578)
+    int[int] aa3 = [0: true ? false ? 1: 2: 3];
+                                       ^
+
+    EXPLANATION:
+    The marked colon is not is not recognized as a TernaryExpression by
+    dparse:
+    If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
+    ASTInformation visit function, which should get called once for every
+    encountered ternary colon, only the second index is printed:
+    override void visit(const TernaryExpression ternaryExpression) { ... }
+
+    This bug can be ignored (formatting error is localized and should be rarely
+    encountered).
+
+
+    FIX:
+    Should this get fixed by dparse or when the migration to dmd is completed,
+    the formatting in the .ref files can be updated to the correct one and this
+    comment can be removed.
+
+
+    Current formatting after applying fix issue 578:
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+                                   ^
+
+    Correct formatting after fix dparse:
+    auto aa3 = [0: true ? false ? 1 : 2 : 3];
+                                    ^
+    +/
+}

tests/otbs/issue0578.d.ref

@@ -0,0 +1,42 @@
+void f() {
+    auto t = true ? 1 : 0;
+    auto a = [true ? 1 : 0];
+    auto aa1 = [0: true ? 1 : 0];
+    auto aa2 = [0: true ? (false ? 1 : 2) : 3];
+
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+    /+
+    READ IF THIS TEST FAILS
+
+    Bug in dparse:
+    (Formatting before fix issue 578)
+    int[int] aa3 = [0: true ? false ? 1: 2: 3];
+                                       ^
+
+    EXPLANATION:
+    The marked colon is not is not recognized as a TernaryExpression by
+    dparse:
+    If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
+    ASTInformation visit function, which should get called once for every
+    encountered ternary colon, only the second index is printed:
+    override void visit(const TernaryExpression ternaryExpression) { ... }
+
+    This bug can be ignored (formatting error is localized and should be rarely
+    encountered).
+
+
+    FIX:
+    Should this get fixed by dparse or when the migration to dmd is completed,
+    the formatting in the .ref files can be updated to the correct one and this
+    comment can be removed.
+
+
+    Current formatting after applying fix issue 578:
+    auto aa3 = [0: true ? false ? 1: 2 : 3];
+                                   ^
+
+    Correct formatting after fix dparse:
+    auto aa3 = [0: true ? false ? 1 : 2 : 3];
+                                    ^
+    +/
+}