Improves map formatting (#514)

Author: simonthuresson

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

@@ -726,6 +726,7 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     this.breakLine();
     const optionsGrp = this.startGroup();
     this.visit(ctx.OPTIONS());
+    this.setOneItemProperty();
     const optionIndent = this.addIndentation();
     this.visit(ctx.mapOrParameter());
     this.removeIndentation(optionIndent);
@@ -2111,6 +2112,7 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
       this._visit(ctx.propertyKeyName(i));
       const mapValueIndent = this.addIndentation();
       this._visitTerminalRaw(ctx.COLON(i));
+      this.setOneItemProperty();
       this._visit(ctx.expression(i));
       if (i < n - 1) {
         this._visit(ctx.COMMA(i));

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

@@ -110,21 +110,19 @@ ON EACH [a.name]`.trimStart();
     const expected = `CREATE CONSTRAINT aaaaaa
 FOR (aaaaaa:aaaaaa)
 REQUIRE (aaaaaa.aaaaaa) IS UNIQUE
-OPTIONS
-  {
-    aaaaaa: "20z9vakp",
-    aaaaaa:
-      {
-        aaaaaa: ["aotV0uiw", "SCxu0Vyn", "ekTx6ngu"],
-        aaaaaa: ["WqAr9IvS", "j5fYJwuN"],
-        aaaaaa: ["HUDXLCRN", "LUfKWGc7"],
-        aaaaaa: ["qbk3JzMe", "Ca4n1Ea9", "I96Uwq16"],
-        aaaaaa: ["zcBcWjoJ", "dz78begI"],
-        aaaaaa: ["MIADLwls", "qkacQgzY", "wYYAgiGo"],
-        aaaaaa: ["Jmw0tXjZ", "ALiXrHno", "QRYTGYFd"],
-        aaaaaa: ["EEJJKZGC", "GGDt2msc"]
-      }
-  }`;
+OPTIONS {
+  aaaaaa: "20z9vakp",
+  aaaaaa: {
+    aaaaaa: ["aotV0uiw", "SCxu0Vyn", "ekTx6ngu"],
+    aaaaaa: ["WqAr9IvS", "j5fYJwuN"],
+    aaaaaa: ["HUDXLCRN", "LUfKWGc7"],
+    aaaaaa: ["qbk3JzMe", "Ca4n1Ea9", "I96Uwq16"],
+    aaaaaa: ["zcBcWjoJ", "dz78begI"],
+    aaaaaa: ["MIADLwls", "qkacQgzY", "wYYAgiGo"],
+    aaaaaa: ["Jmw0tXjZ", "ALiXrHno", "QRYTGYFd"],
+    aaaaaa: ["EEJJKZGC", "GGDt2msc"]
+  }
+}`;
     verifyFormatting(query, expected);
   });
 
@@ -176,4 +174,16 @@ REQUIRE a.id IS UNIQUE
 OPTIONS {constraintName: 'Athlete_Id_Unique'}`;
     verifyFormatting(query, expected);
   });
+  test('OPTION should be able to have nice map print', () => {
+    const query =
+      "CREATE DATABASE testdb OPTIONS {existingData: 'use', seedURI:'s3://bucketpath', seedConfig: 'region=eu-west-1', seedCredentials: 'foo;bar'};";
+    const expected = `CREATE DATABASE testdb
+OPTIONS {
+  existingData: 'use',
+  seedURI: 's3://bucketpath',
+  seedConfig: 'region=eu-west-1',
+  seedCredentials: 'foo;bar'
+};`;
+    verifyFormatting(query, expected);
+  });
 });

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

@@ -540,11 +540,10 @@ RETURN graphName, nodeCount, relationshipCount, createMillis;`;
     "qk5jpmGl", // Name of the projected graph
     ["TB4Tvv6q", "2iCI1Rll", "kaLEqBxX"], // Node labels to include
     {
-      connection:
-        {
-          type: "R3e8WLkh", // Include all relationships
-          orientation: "weFW44Gy" // Treat relationships as undirected
-        }
+      connection: {
+        type: "R3e8WLkh", // Include all relationships
+        orientation: "weFW44Gy" // Treat relationships as undirected
+      }
     }
   )
   YIELD graphName, nodeCount, relationshipCount, createMillis