Parens, map literals

Author: mattbasta

src/languages/clickhouse/clickhouse.formatter.ts

@@ -248,7 +248,7 @@ export const clickhouse: DialectOptions = {
     reservedKeywords: keywords,
     reservedDataTypes: dataTypes,
     reservedFunctionNames: functions,
-    extraParens: ['[]'],
+    extraParens: ['[]', '{}'],
     lineCommentTypes: ['#', '--'],
     nestedBlockComments: false,
     underscoresInNumbers: true,
@@ -258,7 +258,12 @@ export const clickhouse: DialectOptions = {
       // https://clickhouse.com/docs/sql-reference/syntax#defining-and-using-query-parameters
       custom: [
         {
-          regex: String.raw`\{[^:]+:[^}]+\}`,
+          // Parameters are like {foo:Uint64} or {foo:Map(String, String)}
+          // We include `'` in the negated character class to be a little sneaky:
+          // map literals have quoted keys, and we use this to avoid confusing
+          // them for named parameters. This means that the map literal `{'foo':1}`
+          // will be formatted as `{'foo': 1}` rather than `{foo: 1}`.
+          regex: String.raw`\{[^:']+:[^}]+\}`,
           key: v => {
             const match = /\{([^:]+):/.exec(v);
             return match ? match[1].trim() : v;

test/clickhouse.test.ts

@@ -169,7 +169,13 @@ describe('ClickhouseFormatter', () => {
   supportsArrayAndMapAccessors(format);
   supportsDataTypeCase(format);
 
-  // Should support the ternary operator
+  it('supports map literals', () => {
+    expect(format(`SELECT {'foo':1,'bar':10,'baz':2,'zap':8};`)).toBe(dedent`
+      SELECT
+        {'foo': 1, 'bar': 10, 'baz': 2, 'zap': 8};
+    `);
+  });
+
   it('supports the ternary operator', () => {
     // NOTE: Ternary operators have a missing space because
     // ExpressionFormatter's `formatOperator` method special-cases `:`.
@@ -179,7 +185,6 @@ describe('ClickhouseFormatter', () => {
     `);
   });
 
-  // Should support the lambda creation operator
   it('supports the lambda creation operator', () => {
     expect(format('SELECT arrayMap(x->2*x, [1,2,3,4]) AS result;')).toBe(dedent`
       SELECT