Merge pull request #392 from prettier-solidity/change-comments-extractor

Use solidity-comments-extractor

Author: fvictorio

package-lock.json

@@ -75,9 +75,9 @@
     "dir-to-object": "^2.0.0",
     "emoji-regex": "^9.0.0",
     "escape-string-regexp": "^4.0.0",
-    "extract-comments": "^1.1.0",
     "prettier": "^2.0.5",
     "semver": "^7.3.2",
+    "solidity-comments-extractor": "^0.0.4",
     "string-width": "^4.2.0"
   }
 }

package.json

@@ -1,4 +1,4 @@
-const extract = require('extract-comments');
+const extractComments = require('solidity-comments-extractor');
 // https://prettier.io/docs/en/plugins.html#parsers
 const parser = require('@solidity-parser/parser');
 
@@ -14,7 +14,7 @@ const tryHug = (node, operators) => {
 
 function parse(text, parsers, options) {
   const parsed = parser.parse(text, { loc: true, range: true });
-  parsed.comments = extract(text);
+  parsed.comments = extractComments(text);
 
   parser.visit(parsed, {
     ForStatement(ctx) {

src/parser.js

@@ -0,0 +1,12 @@
+pragma solidity 0.6.12;
+
+contract Bug {
+  // This is a comment
+  uint public hello;
+
+  // Another comment
+  uint public bigNum = 100_000;
+
+  // This will disappear
+  uint public magic;
+}

tests/Issues/Issue355.sol

@@ -51,6 +51,35 @@ contract Issue289 {
 
 `;
 
+exports[`Issue355.sol 1`] = `
+pragma solidity 0.6.12;
+
+contract Bug {
+  // This is a comment
+  uint public hello;
+
+  // Another comment
+  uint public bigNum = 100_000;
+
+  // This will disappear
+  uint public magic;
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity 0.6.12;
+
+contract Bug {
+    // This is a comment
+    uint256 public hello;
+
+    // Another comment
+    uint256 public bigNum = 100_000;
+
+    // This will disappear
+    uint256 public magic;
+}
+
+`;
+
 exports[`Issue385.sol 1`] = `
 contract Issue385 {
   function emptyTryCatch() {