refactor: judge the first token and use it's index

eslint · May 12, 2024 · 2d64687 · 2d64687
1 parent ccdaca2
commit 2d64687
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/rules/object-shorthand.js b/lib/rules/object-shorthand.js
@@ -284,8 +284,15 @@ module.exports = {
             const arrowToken = sourceCode.getTokenBefore(node.value.body, astUtils.isArrowToken);
             const fnBody = sourceCode.text.slice(arrowToken.range[1], node.value.range[1]);
 
+            let tokenBeforeParams;
             let shouldAddParensAroundParameters = false;
-            const tokenBeforeParams = sourceCode.getFirstToken(node.value, astUtils.isOpeningParenToken);
+
+            // First token should not be `async`
+            if (node.value.async) {
+                tokenBeforeParams = sourceCode.getFirstToken(node.value, token => !(token.type === "Identifier" && token.value === "async"));
+            } else {
+                tokenBeforeParams = sourceCode.getFirstToken(node.value);
+            }
 
             if (node.value.params.length === 1) {
                 const hasParen = astUtils.isOpeningParenToken(sourceCode.getTokenBefore(node.value.params[0]));
@@ -296,7 +303,7 @@ module.exports = {
 
             const sliceStart = shouldAddParensAroundParameters
                 ? node.value.params[0].range[0]
-                : (node.value.typeParameters || tokenBeforeParams).range[0];
+                : tokenBeforeParams.range[0];
             const sliceEnd = sourceCode.getTokenBefore(arrowToken).range[1];
 
             const oldParamText = sourceCode.text.slice(sliceStart, sliceEnd);