Fix: syntax errors created by object-shorthand autofix (fixes #7574)

lib/rules/object-shorthand.js

@@ -100,6 +100,7 @@ module.exports = {
         const PARAMS = context.options[1] || {};
         const IGNORE_CONSTRUCTORS = PARAMS.ignoreConstructors;
         const AVOID_QUOTES = PARAMS.avoidQuotes;
+        const sourceCode = context.getSourceCode();
 
         //--------------------------------------------------------------------------
         // Helpers
@@ -296,14 +297,19 @@ module.exports = {
                             node,
                             message: "Expected method shorthand.",
                             fix(fixer) {
+
+                                // NOTE: If this rule is enhanced to handle arrow functions as well, this logic needs to be updated.
+                                const functionToken = sourceCode.getTokens(node).find(token => token.type === "Keyword" && token.value === "function");
+
                                 if (node.value.generator) {
-                                    return fixer.replaceTextRange(
-                                        [node.key.range[0], node.value.range[0] + "function*".length],
-                                        `*[${node.key.name}]`
-                                    );
+                                    return fixer.replaceTextRange([sourceCode.getTokenBefore(node.key).range[0], sourceCode.getTokenAfter(functionToken).range[1]], `*[${sourceCode.getText(node.key)}]`);
+                                }
+
+                                if (node.value.async) {
+                                    return fixer.replaceTextRange([sourceCode.getTokenBefore(node.key).range[0], functionToken.range[1]], `async [${sourceCode.getText(node.key)}]`);
                                 }
 
-                                return fixer.removeRange([node.key.range[1] + 1, node.value.range[0] + "function".length]);
+                                return fixer.removeRange([sourceCode.getTokenAfter(node.key).range[1], functionToken.range[1]]);
                             }
                         });
                         return;
@@ -314,14 +320,19 @@ module.exports = {
                         node,
                         message: "Expected method shorthand.",
                         fix(fixer) {
+
+                            // NOTE: If this rule is enhanced to handle arrow functions as well, this logic needs to be updated.
+                            const functionToken = sourceCode.getTokens(node).find(token => token.type === "Keyword" && token.value === "function");
+
                             if (node.value.generator) {
-                                return fixer.replaceTextRange(
-                                    [node.key.range[0], node.value.range[0] + "function*".length],
-                                    `*${node.key.name}`
-                                );
+                                return fixer.replaceTextRange([node.key.range[0], sourceCode.getTokenAfter(functionToken).range[1]], `*${sourceCode.getText(node.key)}`);
+                            }
+
+                            if (node.value.async) {
+                                return fixer.replaceTextRange([node.key.range[0], functionToken.range[1]], `async ${sourceCode.getText(node.key)}`);
                             }
 
-                            return fixer.removeRange([node.key.range[1], node.value.range[0] + "function".length]);
+                            return fixer.removeRange([node.key.range[1], functionToken.range[1]]);
                         }
                     });
                 } else if (node.value.type === "Identifier" && node.key.name === node.value.name && APPLY_TO_PROPS) {