prettier-plugin-solidity - npm Package Compare versions

Comparing version 1.4.0 to 1.4.1

package.json

 {
   "name": "prettier-plugin-solidity",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A Prettier Plugin for automatically formatting your Solidity code.",
@@ -5,0 +5,0 @@ "type": "module",

src/nodes/ExpressionStatement.js

@@ -0,6 +1,27 @@
+import { doc } from 'prettier';
+import { printComments } from '../common/printer-helpers.js';
+
+const { hardline } = doc.builders;
+
 export const ExpressionStatement = {
-  print: ({ node, path, print }) => [
-    path.call(print, 'expression'),
-    node.omitSemicolon ? '' : ';'
-  ]
+  print: ({ node, options, path, print }) => {
+    const parts = [];
+
+    const parent = path.getParentNode();
+
+    if (parent.type === 'IfStatement') {
+      if (node.comments?.length) {
+        const comments = printComments(node, path, options);
+        if (comments?.length) {
+          parts.push(comments);
+          parts.push(hardline);
+        }
+      }
+    }
+
+    parts.push(path.call(print, 'expression'));
+    parts.push(node.omitSemicolon ? '' : ';');
+
+    return parts;
+  }
 };

src/nodes/IfStatement.js

 import { doc } from 'prettier';
-import { printSeparatedItem } from '../common/printer-helpers.js';
+import {
+  printComments,
+  printSeparatedItem
+} from '../common/printer-helpers.js';
 
@@ -22,5 +25,6 @@ const { group, hardline, indent, line } = doc.builders;
 
-const printElse = (node, path, print) => {
+const printElse = (node, path, print, commentsBetweenIfAndElse) => {
   if (node.falseBody) {
-    const elseOnSameLine = node.trueBody.type === 'Block';
+    const elseOnSameLine =
+      node.trueBody.type === 'Block' && commentsBetweenIfAndElse.length === 0;
     return [
@@ -36,9 +40,20 @@ elseOnSameLine ? ' ' : hardline,
 export const IfStatement = {
-  print: ({ node, path, print }) => [
-    'if (',
-    printSeparatedItem(path.call(print, 'condition')),
-    ')',
-    printTrueBody(node, path, print),
-    printElse(node, path, print)
-  ]
+  print: ({ node, options, path, print }) => {
+    const comments = node.comments || [];
+    const commentsBetweenIfAndElse = comments.filter(
+      (comment) => !comment.leading && !comment.trailing
+    );
+
+    const parts = [];
+
+    parts.push('if (', printSeparatedItem(path.call(print, 'condition')), ')');
+    parts.push(printTrueBody(node, path, print));
+    if (commentsBetweenIfAndElse.length && node.falseBody) {
+      parts.push(hardline);
+      parts.push(printComments(node, path, options));
+    }
+    parts.push(printElse(node, path, print, commentsBetweenIfAndElse));
+
+    return parts;
+  }
 };

src/prettier-comments/language-js/comments.js

@@ -260,20 +260,6 @@ import { util } from "prettier";
   ) {
-    if (followingNode.type === "Block") {
-      if(followingNode.statements.length === 0) {
-        addDanglingComment(followingNode, comment);
-      } else {
-        addLeadingComment(followingNode.statements[followingNode.statements.length - 1], comment);
-      }
-    } else if (followingNode.type === "IfStatement") {
-      if (followingNode.trueBody.type === "Block") {
-        if(followingNode.trueBody.statements.length === 0) {
-          addDanglingComment(followingNode.trueBody, comment);
-        } else {
-          addLeadingComment(followingNode.trueBody.statements[0], comment);
-        }
-      } else {
-        addLeadingComment(followingNode.trueBody, comment);
-      }
+    if (precedingNode.type === "ExpressionStatement") {
+      addTrailingComment(precedingNode, comment);
     } else {
-      addLeadingComment(precedingNode, comment);
+      addDanglingComment(enclosingNode, comment);
     }
@@ -283,12 +269,4 @@ return true;
 
-  if (enclosingNode.trueBody === followingNode) {
-    if (followingNode.type === "Block") {
-      if(followingNode.statements.length === 0) {
-        addDanglingComment(followingNode, comment);
-      } else {
-        addLeadingComment(followingNode.statements[0], comment);
-      }
-    } else {
-      addLeadingComment(followingNode, comment);
-    }
+  if (followingNode.type === "ExpressionStatement") {
+    addBlockStatementFirstComment(followingNode, comment);
     return true;
@@ -298,11 +276,3 @@ }
   if (followingNode.type === "IfStatement") {
-    if (followingNode.trueBody.type === "Block") {
-      if(followingNode.trueBody.statements.length === 0) {
-        addDanglingComment(followingNode.trueBody, comment);
-      } else {
-        addLeadingComment(followingNode.trueBody.statements[0], comment);
-      }
-    } else {
-      addLeadingComment(followingNode.trueBody, comment);
-    }
+    addBlockOrNotComment(followingNode.trueBody, comment);
     return true;
@@ -309,0 +279,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

1987170

Lines of code

4741

decreased by-0.06%

No dependency changes