Remove trailing comma for multi-line parenthesized expressions (#90)

dfinity · Mar 12, 2023 · 1d2c9d8 · 1d2c9d8
1 parent f71f53c
commit 1d2c9d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/printers/motoko-tt-ast/print.ts b/src/printers/motoko-tt-ast/print.ts
@@ -339,6 +339,7 @@ function printTokenTree(
                         (!isSeparator || isDelim) &&
                         !hasNestedGroup &&
                         !shouldKeepSameLine() &&
+                        (groupType !== 'Paren' || results.length > 1) &&
                         (groupType === 'Unenclosed' || groupType === 'Curly'
                             ? options.semi
                             : options.trailingComma !== 'none') &&

diff --git a/tests/formatter.test.ts b/tests/formatter.test.ts
@@ -172,7 +172,7 @@ describe('Motoko formatter', () => {
         expect(format('().0')).toStrictEqual('().0\n');
         // expect(format('(\n).0')).toStrictEqual('().0\n');
         expect(format('(\n\n\n).0')).toStrictEqual('().0\n');
-        expect(format('(\na\n).0')).toStrictEqual('(\n  a,\n).0;\n');
+        expect(format('(\na\n).0')).toStrictEqual('(\n  a\n).0;\n');
     });
 
     // test('cursor position', () => {
@@ -286,7 +286,7 @@ describe('Motoko formatter', () => {
 
     test('anonymous function line break', () => {
         expect(format('(func() {\na\n})')).toStrictEqual(
-            '(\n  func() {\n    a;\n  },\n);\n',
+            '(\n  func() {\n    a;\n  }\n);\n',
         );
     });
 
@@ -348,6 +348,10 @@ describe('Motoko formatter', () => {
         expect(format("x : [\nT\n]")).toStrictEqual("x : [\n  T\n];\n");
     });
 
+    test('comma-parentheses', () => {
+        expect(format('if(\nx) { y }')).toStrictEqual('if (\n  x\n) { y };\n');
+    });
+
     // test('generate diff files from compiler tests', () => {
     //     for (const extension of ['mo', 'did']) {
     //         let preOutput = '';