Merge pull request #814 from prettier-solidity/user-defined-operators

User defined operators

package.json

@@ -102,7 +102,7 @@
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.15.0",
+    "@solidity-parser/parser": "^0.16.0",
     "semver": "^7.3.8",
     "solidity-comments-extractor": "^0.0.7"
   },

src/nodes/UsingForDeclaration.js

@@ -7,21 +7,39 @@ const {
 const { printSeparatedList } = require('../common/printer-helpers');
 
 const UsingForDeclaration = {
-  print: ({ node, path, print, options }) => [
-    'using ',
-    node.functions && node.functions.length
-      ? [
-          '{',
-          printSeparatedList(node.functions, {
-            firstSeparator: options.bracketSpacing ? line : softline
-          }),
-          '}'
-        ]
-      : node.libraryName,
-    ' for ',
-    node.typeName ? path.call(print, 'typeName') : '*',
-    node.isGlobal ? ' global;' : ';'
-  ]
+  print: ({ node, path, print, options }) => {
+    const parts = ['using '];
+
+    if (node.functions && node.functions.length) {
+      const importedFunctions = [];
+      for (let i = 0; i < node.functions.length; i += 1) {
+        const fun = node.functions[i];
+        const operator = node.operators[i];
+
+        if (operator) {
+          importedFunctions.push(`${fun} as ${operator}`);
+        } else {
+          importedFunctions.push(fun);
+        }
+      }
+
+      parts.push('{');
+      parts.push(
+        printSeparatedList(importedFunctions, {
+          firstSeparator: options.bracketSpacing ? line : softline
+        })
+      );
+      parts.push('}');
+    } else {
+      parts.push(node.libraryName);
+    }
+
+    parts.push(' for ');
+    parts.push(node.typeName ? path.call(print, 'typeName') : '*');
+    parts.push(node.isGlobal ? ' global;' : ';');
+
+    return parts;
+  }
 };
 
 module.exports = UsingForDeclaration;

tests/format/AllSolidityFeatures/AllSolidityFeatures.sol

@@ -534,3 +534,9 @@ contract WithUncheckedBlock {
     unchecked { return x * y; }
   }
 }
+
+// user-defined operators
+using {  add as +   }   for   Fixed18   global  ;
+using {  add   as +  , sub as - } for   Fixed18 global  ;
+using {  add   , sub as -   } for Fixed18   global  ;
+using {    add as   +  , sub   } for   Fixed18 global  ;

tests/format/AllSolidityFeatures/__snapshots__/jsfmt.spec.js.snap

@@ -543,6 +543,12 @@ contract WithUncheckedBlock {
   }
 }
 
+// user-defined operators
+using {  add as +   }   for   Fixed18   global  ;
+using {  add   as +  , sub as - } for   Fixed18 global  ;
+using {  add   , sub as -   } for Fixed18   global  ;
+using {    add as   +  , sub   } for   Fixed18 global  ;
+
 =====================================output=====================================
 // Examples taken from the Solidity documentation online.
 
@@ -1136,5 +1142,11 @@ contract WithUncheckedBlock {
     }
 }
 
+// user-defined operators
+using {add as +} for Fixed18 global;
+using {add as +, sub as -} for Fixed18 global;
+using {add, sub as -} for Fixed18 global;
+using {add as +, sub} for Fixed18 global;
+
 ================================================================================
 `;