fix: parentheses issues

eslint · Jul 8, 2023 · f27b58b · f27b58b
1 parent ce8d993
commit f27b58b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/lib/rules/no-promise-executor-return.js b/lib/rules/no-promise-executor-return.js
@@ -78,28 +78,32 @@ function expressionIsVoid(node) {
  */
 function voidPrependFixer(sourceCode, node, fixer) {
 
-    /*
-     * prepending `void ` will fail if the node has a lower precedence than void
-     */
+    // prepending `void ` will fail if the node has a lower precedence than void
     if (astUtils.getPrecedence(node) < astUtils.getPrecedence({ type: "UnaryExpression", operator: "void" })) {
 
         // check if there are parentheses around the node to avoid redundant parentheses
-        if (!(sourceCode.getTokenBefore(node).value === "(" && sourceCode.getTokenAfter(node).value === ")")) {
+        if (!astUtils.isParenthesised(sourceCode, node)) {
             return [
                 fixer.insertTextBefore(node, "void ("),
                 fixer.insertTextAfter(node, ")")
             ];
         }
     }
 
-    if (node.parent.type === "ArrowFunctionExpression") {
-        const arrowToken = sourceCode.getTokenBefore(node, astUtils.isArrowToken);
-        const firstToken = sourceCode.getTokenAfter(arrowToken);
+    // avoid parentheses issues
+    const returnOrArrowToken = sourceCode.getTokenBefore(
+        node,
+        node.parent.type === "ArrowFunctionExpression"
+            ? astUtils.isArrowToken
 
-        return fixer.insertTextBefore(firstToken, "void ");
-    }
+            // isReturnToken
+            : token => token.type === "Keyword" && token.value === "return"
+    );
+
+    // avoid spacing issue
+    const firstToken = sourceCode.getTokenAfter(returnOrArrowToken);
 
-    return fixer.insertTextBefore(node, "void ");
+    return fixer.insertTextBefore(firstToken, "void ");
 }
 
 /**

diff --git a/tests/lib/rules/no-promise-executor-return.js b/tests/lib/rules/no-promise-executor-return.js
@@ -290,7 +290,7 @@ ruleTester.run("no-promise-executor-return", rule, {
             "new Promise(r => {() => {}})"
         ]),
 
-        //
+        // primitives
         suggestion({
             code:
                 "new Promise(r => null)",
@@ -311,7 +311,7 @@ ruleTester.run("no-promise-executor-return", rule, {
             "new Promise(r => {null})"
         ]),
 
-        //
+        // inline comments
         suggestion({
             code:
                 "new Promise(r => /*hi*/ ~0)",
@@ -350,7 +350,7 @@ ruleTester.run("no-promise-executor-return", rule, {
             }]
         }),
 
-
+        // multiple returns
         suggestion({
             code:
                 "new Promise(r => { if (foo) { return void 0 } return 0 })",
@@ -361,6 +361,25 @@ ruleTester.run("no-promise-executor-return", rule, {
             "new Promise(r => { if (foo) { return void 0 } return void 0 })"
         ]),
 
+        // return assignment
+        suggestion({
+            code: "new Promise(resolve => { return (foo = resolve(1)); })",
+            options: [{
+                allowVoid: true
+            }]
+        }, [
+            "new Promise(resolve => { return void (foo = resolve(1)); })"
+        ]),
+        suggestion({
+            code: "new Promise(resolve => r = resolve)",
+            options: [{
+                allowVoid: true
+            }]
+        }, [
+            "new Promise(resolve => void (r = resolve))",
+            "new Promise(resolve => {r = resolve})"
+        ]),
+
         // snapshot
         suggestion({
             code: