Using semver rules to properly format pragma versions (#125)

* Using semver rules to properly format pragma versions when more than one rule is declared.

* handling lookbehind in a different way

* Adding a test for the untested branch.

* fixing the copy/paste

* updating snapshot

* add sol scenario

* remove bad pragma

* remove unreachable code

* bump version

Author: Janther

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-solidity",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.0-alpha.22",
   "description": "prettier plugin for solidity",
   "main": "src",
   "scripts": {
@@ -68,6 +68,7 @@
     "escape-string-regexp": "^1.0.5",
     "extract-comments": "^1.1.0",
     "prettier": "^1.15.3",
+    "semver": "^5.6.0",
     "solidity-parser-antlr": "^0.4.0",
     "string-width": "^3.0.0"
   }

src/nodes/PragmaDirective.js

@@ -4,8 +4,21 @@ const {
   }
 } = require('prettier');
 
+const semver = require('semver');
+
 const PragmaDirective = {
-  print: ({ node }) => concat(['pragma ', node.name, ' ', node.value, ';'])
+  print: ({ node }) => {
+    // @TODO: remove hack once solidity-parser-antlr is fixed
+    let value = node.value
+      .replace(/([<>=])/g, ' $1')
+      .replace(/< =/g, '<=')
+      .replace(/> =/g, '>=')
+      .trim();
+    if (value.split(' ').length > 1) {
+      value = semver.validRange(value);
+    }
+    return concat(['pragma ', node.name, ' ', value, ';']);
+  }
 };
 
 module.exports = PragmaDirective;

tests/Pragma/Pragma.sol

@@ -0,0 +1,7 @@
+pragma solidity >=0.4.21   <0.6.0;
+pragma solidity >=0.4.21 <=0.6.0    ;
+pragma solidity    >0.4.21 <0.6.0;
+pragma solidity >0.4.21 <=0.6.0;
+pragma solidity >=0.4.21<0.6.0;
+pragma solidity   ^ 0.4.21  ;
+pragma solidity  ~ 0.4.21  ;

tests/Pragma/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Pragma.sol 1`] = `
+pragma solidity >=0.4.21   <0.6.0;
+pragma solidity >=0.4.21 <=0.6.0    ;
+pragma solidity    >0.4.21 <0.6.0;
+pragma solidity >0.4.21 <=0.6.0;
+pragma solidity >=0.4.21<0.6.0;
+pragma solidity   ^ 0.4.21  ;
+pragma solidity  ~ 0.4.21  ;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity >=0.4.21 <0.6.0;
+pragma solidity >=0.4.21 <=0.6.0;
+pragma solidity >0.4.21 <0.6.0;
+pragma solidity >0.4.21 <=0.6.0;
+pragma solidity >=0.4.21 <0.6.0;
+pragma solidity ^0.4.21;
+pragma solidity ~0.4.21;
+
+`;

tests/Pragma/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname);