Deprecated concat (#517)

* concat has been deprecated since prettier v2.3.0

* updating dependencies

* added lines-and-columns which was an undeclared dependency for jest 27

* Remove remaining usages of the concat builder

Co-authored-by: Franco Victorio <[email protected]>

Author: Janther

package-lock.json

@@ -62,24 +62,25 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "eslint": "^7.24.0",
+    "eslint": "^7.27.0",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-plugin-import": "^2.23.2",
-    "jest": "^26.6.3",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.23.3",
+    "jest": "^27.0.1",
     "jest-mock-now": "^1.3.0",
     "jest-snapshot-serializer-ansi": "^1.0.0",
-    "jest-snapshot-serializer-raw": "^1.1.0",
-    "jest-watch-typeahead": "^0.6.2",
+    "jest-snapshot-serializer-raw": "^1.2.0",
+    "jest-watch-typeahead": "^0.6.4",
+    "lines-and-columns": "^1.1.6",
     "outdent": "^0.8.0",
-    "solc": "^0.8.3"
+    "solc": "^0.8.4"
   },
   "dependencies": {
     "@solidity-parser/parser": "^0.13.0",
     "dir-to-object": "^2.0.0",
     "emoji-regex": "^9.2.2",
     "escape-string-regexp": "^4.0.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "semver": "^7.3.5",
     "solidity-comments-extractor": "^0.0.7",
     "string-width": "^4.2.2"

package.json

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { group, line, concat, indent }
+    builders: { group, line, indent }
   }
 } = require('prettier/standalone');
 const comparison = require('./comparison');
@@ -38,18 +38,16 @@ module.exports = {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
-    const right = concat([node.operator, line, path.call(print, 'right')]);
+    const right = [node.operator, line, path.call(print, 'right')];
     // If it's a single binary operation, avoid having a small right
     // operand like - 1 on its own line
     const shouldGroup =
       node.left.type !== 'BinaryOperation' &&
       path.getParentNode().type !== 'BinaryOperation';
-    return groupIfNecessary(
-      concat([
-        path.call(print, 'left'),
-        ' ',
-        indentIfNecessary(shouldGroup ? group(right) : right)
-      ])
-    );
+    return groupIfNecessary([
+      path.call(print, 'left'),
+      ' ',
+      indentIfNecessary(shouldGroup ? group(right) : right)
+    ]);
   }
 };

src/binary-operator-printers/arithmetic.js

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { group, line, concat, indent }
+    builders: { group, line, indent }
   }
 } = require('prettier/standalone');
 
@@ -19,13 +19,12 @@ module.exports = {
       '/=',
       '%='
     ].includes(op),
-  print: (node, path, print) =>
-    concat([
-      path.call(print, 'left'),
-      ' ',
-      node.operator,
-      node.right.type === 'BinaryOperation'
-        ? group(indent(concat([line, path.call(print, 'right')])))
-        : concat([' ', path.call(print, 'right')])
-    ])
+  print: (node, path, print) => [
+    path.call(print, 'left'),
+    ' ',
+    node.operator,
+    node.right.type === 'BinaryOperation'
+      ? group(indent([line, path.call(print, 'right')]))
+      : [' ', path.call(print, 'right')]
+  ]
 };

src/binary-operator-printers/assignment.js

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { group, line, concat, indent }
+    builders: { group, line, indent }
   }
 } = require('prettier/standalone');
 
@@ -23,18 +23,16 @@ module.exports = {
   print: (node, path, print) => {
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
-    const right = concat([node.operator, line, path.call(print, 'right')]);
+    const right = [node.operator, line, path.call(print, 'right')];
     // If it's a single binary operation, avoid having a small right
     // operand like - 1 on its own line
     const shouldGroup =
       node.left.type !== 'BinaryOperation' &&
       path.getParentNode().type !== 'BinaryOperation';
-    return group(
-      concat([
-        path.call(print, 'left'),
-        ' ',
-        indentIfNecessary(shouldGroup ? group(right) : right)
-      ])
-    );
+    return group([
+      path.call(print, 'left'),
+      ' ',
+      indentIfNecessary(shouldGroup ? group(right) : right)
+    ]);
   }
 };

src/binary-operator-printers/comparison.js

@@ -1,28 +1,26 @@
 const {
   doc: {
-    builders: { group, concat, ifBreak, indent, softline }
+    builders: { group, ifBreak, indent, softline }
   }
 } = require('prettier/standalone');
 
 module.exports = {
   match: (op) => op === '**',
   print: (node, path, print) => {
-    const right = concat([
+    const right = [
       ifBreak(' ', ''),
       node.operator,
       softline,
       path.call(print, 'right')
-    ]);
+    ];
     // If it's a single binary operation, avoid having a small right
     // operand like - 1 on its own line
     const shouldGroup =
       node.left.type !== 'BinaryOperation' &&
       path.getParentNode().type !== 'BinaryOperation';
-    return group(
-      concat([
-        path.call(print, 'left'),
-        indent(shouldGroup ? group(right) : right)
-      ])
-    );
+    return group([
+      path.call(print, 'left'),
+      indent(shouldGroup ? group(right) : right)
+    ]);
   }
 };

src/binary-operator-printers/exponentiation.js

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { group, line, concat, indent }
+    builders: { group, line, indent }
   }
 } = require('prettier/standalone');
 
@@ -26,18 +26,16 @@ module.exports = {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
-    const right = concat([node.operator, line, path.call(print, 'right')]);
+    const right = [node.operator, line, path.call(print, 'right')];
     // If it's a single binary operation, avoid having a small right
     // operand like - 1 on its own line
     const shouldGroup =
       node.left.type !== 'BinaryOperation' &&
       path.getParentNode().type !== 'BinaryOperation';
-    return groupIfNecessary(
-      concat([
-        path.call(print, 'left'),
-        ' ',
-        indentIfNecessary(shouldGroup ? group(right) : right)
-      ])
-    );
+    return groupIfNecessary([
+      path.call(print, 'left'),
+      ' ',
+      indentIfNecessary(shouldGroup ? group(right) : right)
+    ]);
   }
 };

src/binary-operator-printers/logical.js

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { concat, hardline, join }
+    builders: { hardline, join }
   }
 } = require('prettier');
 const { hasNewline } = require('../prettier-comments/common/util');
@@ -17,7 +17,7 @@ function isIndentableBlockComment(comment) {
 function printIndentableBlockComment(comment) {
   const lines = comment.raw.split('\n');
 
-  return concat([
+  return [
     '/*',
     join(
       hardline,
@@ -28,7 +28,7 @@ function printIndentableBlockComment(comment) {
       )
     ),
     '*/'
-  ]);
+  ];
 }
 
 function printComment(commentPath, options) {
@@ -47,7 +47,7 @@ function printComment(commentPath, options) {
             backwards: true
           })
         ) {
-          return concat([hardline, printed]);
+          return [hardline, printed];
         }
         return printed;
       }

src/comments/printer.js

@@ -1,17 +1,10 @@
-const {
-  doc: {
-    builders: { concat }
-  }
-} = require('prettier/standalone');
-
 const ArrayTypeName = {
-  print: ({ node, path, print }) =>
-    concat([
-      path.call(print, 'baseTypeName'),
-      '[',
-      node.length ? path.call(print, 'length') : '',
-      ']'
-    ])
+  print: ({ node, path, print }) => [
+    path.call(print, 'baseTypeName'),
+    '[',
+    node.length ? path.call(print, 'length') : '',
+    ']'
+  ]
 };
 
 module.exports = ArrayTypeName;

src/nodes/ArrayTypeName.js

@@ -1,6 +1,6 @@
 const {
   doc: {
-    builders: { concat, hardline }
+    builders: { hardline }
   }
 } = require('prettier/standalone');
 
@@ -9,18 +9,17 @@ const printComments = require('./print-comments');
 const printPreservingEmptyLines = require('./print-preserving-empty-lines');
 
 const AssemblyBlock = {
-  print: ({ node, options, path, print }) =>
-    concat([
-      '{',
-      printSeparatedItem(
-        concat([
-          printPreservingEmptyLines(path, 'operations', options, print),
-          printComments(node, path, options)
-        ]),
-        { firstSeparator: hardline }
-      ),
-      '}'
-    ])
+  print: ({ node, options, path, print }) => [
+    '{',
+    printSeparatedItem(
+      [
+        printPreservingEmptyLines(path, 'operations', options, print),
+        printComments(node, path, options)
+      ],
+      { firstSeparator: hardline }
+    ),
+    '}'
+  ]
 };
 
 module.exports = AssemblyBlock;