Merge pull request #393 from prettier-solidity/multi-part-literals

Don't join multi-part literals

Author: fvictorio

package-lock.json

@@ -71,7 +71,7 @@
     "jest-watch-typeahead": "^0.6.0"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.9.0",
+    "@solidity-parser/parser": "^0.9.1",
     "dir-to-object": "^2.0.0",
     "emoji-regex": "^9.0.0",
     "escape-string-regexp": "^4.0.0",

package.json

@@ -1,5 +1,16 @@
+const {
+  doc: {
+    builders: { join, line }
+  }
+} = require('prettier/standalone');
+
+const { printString } = require('../prettier-comments/common/util');
+
 const HexLiteral = {
-  print: ({ node }) => node.value
+  print: ({ node, options }) => {
+    const list = node.parts.map((part) => `hex${printString(part, options)}`);
+    return join(line, list);
+  }
 };
 
 module.exports = HexLiteral;

src/nodes/HexLiteral.js

@@ -1,7 +1,15 @@
+const {
+  doc: {
+    builders: { join, line }
+  }
+} = require('prettier/standalone');
 const { printString } = require('../prettier-comments/common/util');
 
 const StringLiteral = {
-  print: ({ node, options }) => printString(node.value, options)
+  print: ({ node, options }) => {
+    const list = node.parts.map((part) => printString(part, options));
+    return join(line, list);
+  }
 };
 
 module.exports = StringLiteral;

src/nodes/StringLiteral.js

@@ -0,0 +1,10 @@
+contract MultipartStrings {
+  bytes b1 = hex'beef';
+  bytes b2 = hex"beef";
+  bytes b3 = hex"beef" hex"c0ffee";
+  bytes b4 = hex"beeeeeeeeeeeeeeeeeeeeeef" hex"c0000000000ffeeeeeeeeeeeeeeeeeee";
+
+  string s1 = "foo";
+  string s2 = "foo" "bar";
+  string s3 = "foofoofoofooofoofoofofoooofofoo" "barbarbrabrbarbarbabrabrbabr";
+}

tests/MultipartStrings/MultipartStrings.sol

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MultipartStrings.sol 1`] = `
+contract MultipartStrings {
+  bytes b1 = hex'beef';
+  bytes b2 = hex"beef";
+  bytes b3 = hex"beef" hex"c0ffee";
+  bytes b4 = hex"beeeeeeeeeeeeeeeeeeeeeef" hex"c0000000000ffeeeeeeeeeeeeeeeeeee";
+
+  string s1 = "foo";
+  string s2 = "foo" "bar";
+  string s3 = "foofoofoofooofoofoofofoooofofoo" "barbarbrabrbarbarbabrabrbabr";
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+contract MultipartStrings {
+    bytes b1 = hex"beef";
+    bytes b2 = hex"beef";
+    bytes b3 = hex"beef" hex"c0ffee";
+    bytes b4 =
+        hex"beeeeeeeeeeeeeeeeeeeeeef"
+        hex"c0000000000ffeeeeeeeeeeeeeeeeeee";
+
+    string s1 = "foo";
+    string s2 = "foo" "bar";
+    string s3 =
+        "foofoofoofooofoofoofofoooofofoo"
+        "barbarbrabrbarbarbabrabrbabr";
+}
+
+`;

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

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