Fixes postfix edgecases in formatter (#490)

Author: tomasnyberg

packages/language-support/src/formatting/formatting.ts

@@ -1639,18 +1639,29 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
   };
 
   visitIndexPostfix = (ctx: IndexPostfixContext) => {
+    this.avoidSpaceBetween();
+    this.avoidBreakBetween();
+    const indexPostfixGrp = this.startGroup();
     this._visit(ctx.LBRACKET());
+    this.avoidBreakBetween();
     this._visit(ctx.expression());
-    this.avoidSpaceBetween();
     this._visit(ctx.RBRACKET());
+    this.endGroup(indexPostfixGrp);
   };
 
   visitRangePostfix = (ctx: RangePostfixContext) => {
+    this.avoidSpaceBetween();
+    this.avoidBreakBetween();
+    const rangePostfixGrp = this.startGroup();
     this._visit(ctx.LBRACKET());
     if (ctx._fromExp) {
       this._visit(ctx.expression(0));
     }
-    this._visit(ctx.DOTDOT());
+    if (ctx.DOTDOT()) {
+      this.avoidSpaceBetween();
+      this._visit(ctx.DOTDOT());
+      this.avoidSpaceBetween();
+    }
     if (ctx._toExp) {
       if (ctx._fromExp) {
         this._visit(ctx.expression(1));
@@ -1660,6 +1671,7 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     }
     this.avoidSpaceBetween();
     this._visit(ctx.RBRACKET());
+    this.endGroup(rangePostfixGrp);
   };
 
   // Handled separately because it contains subclauses (and thus indentation rules)

packages/language-support/src/tests/formatting/edgecases.test.ts

@@ -189,7 +189,7 @@ RETURN
     description:
       CASE
         WHEN p.Description IS NULL OR size(p.Description) = "TxWb1jb3" THEN []
-        ELSE p.Description[.. "VM6fSkTL"]
+        ELSE p.Description[.."VM6fSkTL"]
       END
   } AS node,
   r,
@@ -198,7 +198,7 @@ RETURN
     description:
       CASE
         WHEN b.Description IS NULL OR size(b.Description) = "wnBMZdOC" THEN []
-        ELSE b.Description[.. "NHIwucAy"]
+        ELSE b.Description[.."NHIwucAy"]
       END
   } AS endNode;`.trimStart();
     verifyFormatting(query, expected);
@@ -219,7 +219,7 @@ RETURN
     description:
       CASE p.age
         WHEN p.Description IS NULL OR size(p.Description) = "TxWb1jb3" THEN []
-        ELSE p.Description[.. "VM6fSkTL"]
+        ELSE p.Description[.."VM6fSkTL"]
       END
   } AS node,
   r,
@@ -228,7 +228,7 @@ RETURN
     description:
       CASE p.age
         WHEN b.Description IS NULL OR size(b.Description) = "wnBMZdOC" THEN []
-        ELSE b.Description[.. "NHIwucAy"]
+        ELSE b.Description[.."NHIwucAy"]
       END
   } AS endNode;`;
     verifyFormatting(query, expected);
@@ -1115,4 +1115,52 @@ WHERE
   (aaaaaa)<-[:aaaaaa]-(:aaaaaa)-[:aaaaaa]->(aaaaaa) //IKCKaFRvOLUsiwpZZgdhsXrNwWHZHLoUkraBtkoUQrFiLEW`;
     verifyFormatting(query, expected);
   });
+
+  test('postfix after a collect', () => {
+    const query = `WITH DISTINCT
+  COLLECT {
+    MATCH (p)-[:XYZ_ABCD12]->(q)
+    RETURN q.blnk
+  }
+  [
+  "Ab12Cd34"] AS sdflkjl52_2462,
+  qwer1["Bc34Df56"] AS ftgy3_hjkl_pqr23,
+  qwer1["Gh78Ij90"] AS zxcv5_bnmd_qwe45,
+  qwer1["Kl12Mn34"] AS rtyu6_asdf_ghj67,
+  qwer1
+
+RETURN *`;
+    const expected = `WITH DISTINCT
+  COLLECT {
+    MATCH (p)-[:XYZ_ABCD12]->(q)
+    RETURN q.blnk
+  }["Ab12Cd34"] AS sdflkjl52_2462,
+  qwer1["Bc34Df56"] AS ftgy3_hjkl_pqr23,
+  qwer1["Gh78Ij90"] AS zxcv5_bnmd_qwe45,
+  qwer1["Kl12Mn34"] AS rtyu6_asdf_ghj67,
+  qwer1
+
+RETURN *`;
+    verifyFormatting(query, expected);
+  });
+
+  test('range postfix after a collect', () => {
+    const query = `MATCH (n)
+RETURN
+  COLLECT {
+    MATCH (n)
+    RETURN n
+  }
+  [
+  1
+  ..
+  10]`;
+    const expected = `MATCH (n)
+RETURN
+  COLLECT {
+    MATCH (n)
+    RETURN n
+  }[1..10]`;
+    verifyFormatting(query, expected);
+  });
 });

packages/language-support/src/tests/formatting/linebreaks.test.ts

@@ -515,7 +515,7 @@ RETURN [stop in n[..-1] | stop.name] AS stops`;
 MATCH
   SHORTEST 1
   (:Station {name: 'Hartlebury'}) (()--(n))+(:Station {name: 'Cheltenham Spa'})
-RETURN [stop IN n[.. -1] | stop.name] AS stops`.trimStart();
+RETURN [stop IN n[..-1] | stop.name] AS stops`.trimStart();
     verifyFormatting(query, expected);
   });
 
@@ -530,8 +530,8 @@ MATCH
   ((:Station {name: 'Hartlebury'})
     (()--(n:Station))+
     (:Station {name: 'Cheltenham Spa'})
-    WHERE none(stop IN n[.. -1] WHERE stop.name = 'Bromsgrove'))
-RETURN [stop IN n[.. -1] | stop.name] AS stops`.trimStart();
+    WHERE none(stop IN n[..-1] WHERE stop.name = 'Bromsgrove'))
+RETURN [stop IN n[..-1] | stop.name] AS stops`.trimStart();
     verifyFormatting(query, expected);
   });
 
@@ -550,10 +550,10 @@ MATCH
     (:Station {name: 'Cheltenham Spa'})
     WHERE
       none(
-        stop IN n[.. -1]
+        stop IN n[..-1]
         WHERE stop.name = 'Bromsgroveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
       ))
-RETURN [stop IN n[.. -1] | stop.name] AS stops`.trimStart();
+RETURN [stop IN n[..-1] | stop.name] AS stops`.trimStart();
     verifyFormatting(query, expected);
   });
 
@@ -569,8 +569,8 @@ MATCH
     ((:Station {name: 'Thisisanabsurdlylongnametomakeitawkward'})
       (()--(n:Station))+
       (:Station {name: 'Cheltenham Spa'})
-      WHERE none(stop IN n[.. -1] WHERE stop.name = 'Bromsgrove'))
-RETURN [stop IN n[.. -1] | stop.name] AS stops`.trimStart();
+      WHERE none(stop IN n[..-1] WHERE stop.name = 'Bromsgrove'))
+RETURN [stop IN n[..-1] | stop.name] AS stops`.trimStart();
     verifyFormatting(query, expected);
   });
 
@@ -1127,14 +1127,14 @@ LIMIT "g68S0y7w";`;
 WITH n, collect(n) AS duplicates
 WHERE size(duplicates) > "zuEVCUOg"
 WITH
-  duplicates["2x5H4FCD"] AS keepNode, duplicates["oMXseK4u" ..] AS deleteNodes
+  duplicates["2x5HHHH4FCD"] AS keepNode, duplicates["oMXseK4u" ..] AS deleteNodes
 RETURN deleteNodes`;
     const expected = `MATCH (n:Course {id: "fxmrRAfg"})-[r*]->(b)
 WITH n, collect(n) AS duplicates
 WHERE size(duplicates) > "zuEVCUOg"
 WITH
-  duplicates["2x5H4FCD"] AS keepNode,
-  duplicates["oMXseK4u" ..] AS deleteNodes
+  duplicates["2x5HHHH4FCD"] AS keepNode,
+  duplicates["oMXseK4u"..] AS deleteNodes
 RETURN deleteNodes`;
     verifyFormatting(query, expected);
   });