prettier:fix (#254)

mattiaerre · web-flow · commit a6b39688864d · 2020-03-24T10:36:58.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "codecov": "^3.6.5",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-import": "^2.20.1",
     "jest": "^25.1.0",
     "jest-mock-now": "^1.3.0",
@@ -75,7 +75,7 @@
     "emoji-regex": "^8.0.0",
     "escape-string-regexp": "^2.0.0",
     "extract-comments": "^1.1.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.2",
     "semver": "^7.1.3",
     "solidity-parser-diligence": "^0.4.18",
     "string-width": "^4.2.0"
diff --git a/src/binary-operator-printers/arithmetic.js b/src/binary-operator-printers/arithmetic.js
@@ -5,7 +5,7 @@ const {
 } = require('prettier/standalone');
 const comparison = require('./comparison.js');
 
-const groupIfNecessaryBuilder = path => doc => {
+const groupIfNecessaryBuilder = (path) => (doc) => {
   const parentNode = path.getParentNode();
   if (
     parentNode.type === 'BinaryOperation' &&
@@ -16,7 +16,7 @@ const groupIfNecessaryBuilder = path => doc => {
   return group(doc);
 };
 
-const indentIfNecessaryBuilder = path => doc => {
+const indentIfNecessaryBuilder = (path) => (doc) => {
   let node = path.getNode();
   for (let i = 0; ; i += 1) {
     const parentNode = path.getParentNode(i);
@@ -33,7 +33,7 @@ const indentIfNecessaryBuilder = path => doc => {
 };
 
 module.exports = {
-  match: op => ['+', '-', '*', '/', '%'].includes(op),
+  match: (op) => ['+', '-', '*', '/', '%'].includes(op),
   print: (node, path, print) => {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path);
diff --git a/src/binary-operator-printers/assignment.js b/src/binary-operator-printers/assignment.js
@@ -5,7 +5,7 @@ const {
 } = require('prettier/standalone');
 
 module.exports = {
-  match: op =>
+  match: (op) =>
     [
       '=',
       '|=',
diff --git a/src/binary-operator-printers/bit.js b/src/binary-operator-printers/bit.js
@@ -1,6 +1,6 @@
 const arithmetic = require('./arithmetic.js');
 
 module.exports = {
-  match: op => ['&', '|', '^'].includes(op),
+  match: (op) => ['&', '|', '^'].includes(op),
   print: arithmetic.print
 };
diff --git a/src/binary-operator-printers/comparison.js b/src/binary-operator-printers/comparison.js
@@ -4,7 +4,7 @@ const {
   }
 } = require('prettier/standalone');
 
-const indentIfNecessaryBuilder = path => doc => {
+const indentIfNecessaryBuilder = (path) => (doc) => {
   let node = path.getNode();
   for (let i = 0; ; i += 1) {
     const parentNode = path.getParentNode(i);
@@ -19,7 +19,7 @@ const indentIfNecessaryBuilder = path => doc => {
 };
 
 module.exports = {
-  match: op => ['<', '>', '<=', '>=', '==', '!='].includes(op),
+  match: (op) => ['<', '>', '<=', '>=', '==', '!='].includes(op),
   print: (node, path, print) => {
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
diff --git a/src/binary-operator-printers/exponentiation.js b/src/binary-operator-printers/exponentiation.js
@@ -5,7 +5,7 @@ const {
 } = require('prettier/standalone');
 
 module.exports = {
-  match: op => op === '**',
+  match: (op) => op === '**',
   print: (node, path, print) => {
     const right = concat([
       ifBreak(' ', ''),
diff --git a/src/binary-operator-printers/logical.js b/src/binary-operator-printers/logical.js
@@ -4,10 +4,10 @@ const {
   }
 } = require('prettier/standalone');
 
-const groupIfNecessaryBuilder = path => doc =>
+const groupIfNecessaryBuilder = (path) => (doc) =>
   path.getParentNode().type === 'BinaryOperation' ? doc : group(doc);
 
-const indentIfNecessaryBuilder = path => doc => {
+const indentIfNecessaryBuilder = (path) => (doc) => {
   let node = path.getNode();
   for (let i = 0; ; i += 1) {
     const parentNode = path.getParentNode(i);
@@ -21,7 +21,7 @@ const indentIfNecessaryBuilder = path => doc => {
 };
 
 module.exports = {
-  match: op => ['&&', '||'].includes(op),
+  match: (op) => ['&&', '||'].includes(op),
   print: (node, path, print) => {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path);
diff --git a/src/binary-operator-printers/shift.js b/src/binary-operator-printers/shift.js
@@ -1,6 +1,6 @@
 const arithmetic = require('./arithmetic.js');
 
 module.exports = {
-  match: op => ['<<', '>>'].includes(op),
+  match: (op) => ['<<', '>>'].includes(op),
   print: arithmetic.print
 };
diff --git a/src/comments/printer.js b/src/comments/printer.js
@@ -11,7 +11,7 @@ function isIndentableBlockComment(comment) {
   // `*/` delimiters are not included in the comment value, so add them
   // back first.
   const lines = `*${comment.raw}*`.split('\n');
-  return lines.length > 1 && lines.every(line => line.trim()[0] === '*');
+  return lines.length > 1 && lines.every((line) => line.trim()[0] === '*');
 }
 
 function printIndentableBlockComment(comment) {
diff --git a/src/nodes/ElementaryTypeName.js b/src/nodes/ElementaryTypeName.js
@@ -4,7 +4,7 @@ const {
   }
 } = require('prettier/standalone');
 
-const stateMutability = node =>
+const stateMutability = (node) =>
   node.stateMutability && node.stateMutability.length > 0
     ? concat([' ', node.stateMutability])
     : '';
diff --git a/src/nodes/FunctionDefinition.js b/src/nodes/FunctionDefinition.js
@@ -28,14 +28,14 @@ const parameters = (parametersType, node, path, print) =>
     ? printSeparatedList(path.map(print, parametersType))
     : '';
 
-const visibility = node =>
+const visibility = (node) =>
   node.visibility && node.visibility !== 'default'
     ? concat([line, node.visibility])
     : '';
 
-const virtual = node => (node.isVirtual ? concat([line, 'virtual']) : '');
+const virtual = (node) => (node.isVirtual ? concat([line, 'virtual']) : '');
 
-const stateMutability = node =>
+const stateMutability = (node) =>
   node.stateMutability && node.stateMutability !== 'default'
     ? concat([line, node.stateMutability])
     : '';
@@ -55,7 +55,7 @@ const returnParameters = (node, path, print) =>
       ])
     : '';
 
-const signatureEnd = node => (node.body ? dedent(line) : ';');
+const signatureEnd = (node) => (node.body ? dedent(line) : ';');
 
 const body = (node, path, print) => (node.body ? path.call(print, 'body') : '');
 
diff --git a/src/nodes/FunctionTypeName.js b/src/nodes/FunctionTypeName.js
@@ -16,12 +16,12 @@ const returnTypes = (node, path, print) =>
       ])
     : '';
 
-const visibility = node =>
+const visibility = (node) =>
   node.visibility && node.visibility !== 'default'
     ? concat([line, node.visibility])
     : '';
 
-const stateMutability = node =>
+const stateMutability = (node) =>
   node.stateMutability && node.stateMutability !== 'default'
     ? concat([line, node.stateMutability])
     : '';
diff --git a/src/nodes/MemberAccess.js b/src/nodes/MemberAccess.js
@@ -4,7 +4,7 @@ const {
   }
 } = require('prettier/standalone');
 
-const isBeginnigOfChain = path => {
+const isBeginnigOfChain = (path) => {
   const parentNodeType = path.getParentNode().type;
 
   if (parentNodeType === 'MemberAccess') return false;
diff --git a/src/nodes/VariableDeclaration.js b/src/nodes/VariableDeclaration.js
@@ -4,21 +4,21 @@ const {
   }
 } = require('prettier/standalone');
 
-const indexed = node => (node.isIndexed ? ' indexed' : '');
+const indexed = (node) => (node.isIndexed ? ' indexed' : '');
 
-const visibility = node =>
+const visibility = (node) =>
   node.visibility && node.visibility !== 'default'
     ? concat([' ', node.visibility])
     : '';
 
-const constantKeyword = node => (node.isDeclaredConst ? ' constant' : '');
+const constantKeyword = (node) => (node.isDeclaredConst ? ' constant' : '');
 
-const storageLocation = node =>
+const storageLocation = (node) =>
   node.storageLocation && node.visibility !== 'default'
     ? concat([' ', node.storageLocation])
     : '';
 
-const name = node => (node.name ? concat([' ', node.name]) : '');
+const name = (node) => (node.name ? concat([' ', node.name]) : '');
 
 const VariableDeclaration = {
   print: ({ node, path, print }) =>
diff --git a/src/nodes/VariableDeclarationStatement.js b/src/nodes/VariableDeclarationStatement.js
@@ -15,7 +15,7 @@ const initialValue = (node, path, print) =>
 const VariableDeclarationStatement = {
   print: ({ node, path, print }) => {
     const startsWithVar =
-      node.variables.filter(x => x && x.typeName).length === 0;
+      node.variables.filter((x) => x && x.typeName).length === 0;
 
     return concat([
       startsWithVar ? 'var ' : '',
diff --git a/src/nodes/print-comments.js b/src/nodes/print-comments.js
@@ -9,15 +9,15 @@ const printComments = (node, path, options) =>
     ? join(
         line,
         path
-          .map(commentPath => {
+          .map((commentPath) => {
             const comment = commentPath.getValue();
             if (comment.trailing || comment.leading) {
               return null;
             }
             comment.printed = true;
             return options.printer.printComment(commentPath);
           }, 'comments')
-          .filter(element => element)
+          .filter((element) => element)
       )
     : '';
 
diff --git a/src/nodes/print-preserving-empty-lines.js b/src/nodes/print-preserving-empty-lines.js
@@ -7,7 +7,7 @@ const {
 
 function printPreservingEmptyLines(path, key, options, print) {
   const parts = [];
-  path.each(childPath => {
+  path.each((childPath) => {
     const node = childPath.getValue();
     const nodeType = node.type;
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const {`
`5`	`5`	`} = require('prettier/standalone');`
`6`	`6`
`7`	`7`	`module.exports = {`
`8`		`- match: op =>`
	`8`	`+ match: (op) =>`
`9`	`9`	`[`
`10`	`10`	`'=',`
`11`	`11`	`'\|=',`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function isIndentableBlockComment(comment) {`
`11`	`11`	// `*/` delimiters are not included in the comment value, so add them
`12`	`12`	`// back first.`
`13`	`13`	const lines = `${comment.raw}`.split('\n');
`14`		`- return lines.length > 1 && lines.every(line => line.trim()[0] === '*');`
	`14`	`+ return lines.length > 1 && lines.every((line) => line.trim()[0] === '*');`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`function printIndentableBlockComment(comment) {`