using ... for ... supporting functions and global (prettier-solidity#683)

* using the latest parser

* UsingForDeclaration with support for functions

* removing unused TypeNameExpression

Author: Janther

package-lock.json

@@ -83,7 +83,7 @@
     "solc": "^0.8.14-fixed"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.14.1",
+    "@solidity-parser/parser": "^0.14.2-beta.1",
     "emoji-regex": "^10.1.0",
     "escape-string-regexp": "^4.0.0",
     "semver": "^7.3.7",

package.json

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1621622090.188 */
+/* This file was automatically generated on 1653243394.809 */
 
 /* eslint-disable global-require */
 

src/binary-operator-printers/index.js

@@ -1,10 +1,26 @@
+const {
+  doc: {
+    builders: { line, softline }
+  }
+} = require('prettier');
+
+const printSeparatedList = require('./print-separated-list');
+
 const UsingForDeclaration = {
-  print: ({ node, path, print }) => [
+  print: ({ node, path, print, options }) => [
     'using ',
-    node.libraryName,
+    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;' : ';'
   ]
 };
 

src/nodes/TypeNameExpression.js

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1621622090.034 */
+/* This file was automatically generated on 1653243394.65 */
 
 /* eslint-disable global-require */
 
@@ -66,7 +66,6 @@ module.exports = {
   TryStatement: require('./TryStatement'),
   TupleExpression: require('./TupleExpression'),
   TypeDefinition: require('./TypeDefinition'),
-  TypeNameExpression: require('./TypeNameExpression'),
   UnaryOperation: require('./UnaryOperation'),
   UncheckedStatement: require('./UncheckedStatement'),
   UserDefinedTypeName: require('./UserDefinedTypeName'),

src/nodes/UsingForDeclaration.js

@@ -0,0 +1,10 @@
+  using   Lib    for uint;
+using Lib for
+    uint global;
+using { f} for uint;
+using {f } for uint global;
+using { a, very,     long, and, complex,     Function, list, with, long, names }     for
+    uint;
+using { a, very,
+        long, and, complex, Function,
+        list, with, long, names }       for uint global;

src/nodes/index.js

@@ -0,0 +1,102 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Libraries.sol - {"bracketSpacing":true} format 1`] = `
+====================================options=====================================
+bracketSpacing: true
+parsers: ["solidity-parse"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+  using   Lib    for uint;
+using Lib for
+    uint global;
+using { f} for uint;
+using {f } for uint global;
+using { a, very,     long, and, complex,     Function, list, with, long, names }     for
+    uint;
+using { a, very,
+        long, and, complex, Function,
+        list, with, long, names }       for uint global;
+
+=====================================output=====================================
+using Lib for uint256;
+using Lib for uint256 global;
+using { f } for uint256;
+using { f } for uint256 global;
+using {
+    a,
+    very,
+    long,
+    and,
+    complex,
+    Function,
+    list,
+    with,
+    long,
+    names
+} for uint256;
+using {
+    a,
+    very,
+    long,
+    and,
+    complex,
+    Function,
+    list,
+    with,
+    long,
+    names
+} for uint256 global;
+
+================================================================================
+`;
+
+exports[`Libraries.sol format 1`] = `
+====================================options=====================================
+parsers: ["solidity-parse"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+  using   Lib    for uint;
+using Lib for
+    uint global;
+using { f} for uint;
+using {f } for uint global;
+using { a, very,     long, and, complex,     Function, list, with, long, names }     for
+    uint;
+using { a, very,
+        long, and, complex, Function,
+        list, with, long, names }       for uint global;
+
+=====================================output=====================================
+using Lib for uint256;
+using Lib for uint256 global;
+using {f} for uint256;
+using {f} for uint256 global;
+using {
+    a,
+    very,
+    long,
+    and,
+    complex,
+    Function,
+    list,
+    with,
+    long,
+    names
+} for uint256;
+using {
+    a,
+    very,
+    long,
+    and,
+    complex,
+    Function,
+    list,
+    with,
+    long,
+    names
+} for uint256 global;
+
+================================================================================
+`;

tests/format/Libraries/Libraries.sol

@@ -0,0 +1,2 @@
+run_spec(__dirname, ['solidity-parse']);
+run_spec(__dirname, ['solidity-parse'], { bracketSpacing: true });