Fix: no-undef-init should not apply to class fields (refs #14857)

eslint · Aug 30, 2021 · 742ac06 · 742ac06
1 parent 80cfb8f
commit 742ac06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 90 deletions.
diff --git a/lib/rules/no-undef-init.js b/lib/rules/no-undef-init.js
@@ -33,91 +33,37 @@ module.exports = {
 
         const sourceCode = context.getSourceCode();
 
-        /**
-         * Get the node of init target.
-         * @param {ASTNode} node The node to get.
-         * @throws {Error} (Unreachable.)
-         * @returns {ASTNode} The node of init target.
-         */
-        function getIdNode(node) {
-            switch (node.type) {
-                case "VariableDeclarator":
-                    return node.id;
-                case "PropertyDefinition":
-                    return node.key;
-                default:
-                    throw new Error("unreachable");
-            }
-        }
-
-        /**
-         * Get the node of init value.
-         * @param {ASTNode} node The node to get.
-         * @throws {Error} (Unreachable.)
-         * @returns {ASTNode} The node of init value.
-         */
-        function getInitNode(node) {
-            switch (node.type) {
-                case "VariableDeclarator":
-                    return node.init;
-                case "PropertyDefinition":
-                    return node.value;
-                default:
-                    throw new Error("unreachable");
-            }
-        }
-
-        /**
-         * Get the parent kind of the node.
-         * @param {ASTNode} node The node to get.
-         * @throws {Error} (Unreachable.)
-         * @returns {string} The parent kind.
-         */
-        function getParentKind(node) {
-            switch (node.type) {
-                case "VariableDeclarator":
-                    return node.parent.kind;
-                case "PropertyDefinition":
-                    return "field";
-                default:
-                    throw new Error("unreachable");
-            }
-        }
-
         return {
 
-            "VariableDeclarator, PropertyDefinition"(node) {
-                const idNode = getIdNode(node),
-                    name = sourceCode.getText(idNode),
-                    initNode = getInitNode(node),
-                    initIsUndefined = initNode && initNode.type === "Identifier" && initNode.name === "undefined",
-                    parentKind = getParentKind(node),
+            VariableDeclarator(node) {
+                const name = sourceCode.getText(node.id),
+                    init = node.init && node.init.name,
                     scope = context.getScope(),
                     undefinedVar = astUtils.getVariableByName(scope, "undefined"),
                     shadowed = undefinedVar && undefinedVar.defs.length > 0,
-                    lastToken = sourceCode.getLastToken(node, astUtils.isNotSemicolonToken);
+                    lastToken = sourceCode.getLastToken(node);
 
-                if (initIsUndefined && parentKind !== "const" && !shadowed) {
+                if (init === "undefined" && node.parent.kind !== "const" && !shadowed) {
                     context.report({
                         node,
                         messageId: "unnecessaryUndefinedInit",
                         data: { name },
                         fix(fixer) {
-                            if (parentKind === "var") {
+                            if (node.parent.kind === "var") {
                                 return null;
                             }
 
-                            if (idNode.type === "ArrayPattern" || idNode.type === "ObjectPattern") {
+                            if (node.id.type === "ArrayPattern" || node.id.type === "ObjectPattern") {
 
                                 // Don't fix destructuring assignment to `undefined`.
                                 return null;
                             }
 
-                            if (sourceCode.commentsExistBetween(idNode, lastToken)) {
+                            if (sourceCode.commentsExistBetween(node.id, lastToken)) {
                                 return null;
                             }
 
-                            return fixer.removeRange([idNode.range[1], lastToken.range[1]]);
+                            return fixer.removeRange([node.id.range[1], node.range[1]]);
                         }
                     });
                 }

diff --git a/tests/lib/rules/no-undef-init.js b/tests/lib/rules/no-undef-init.js
@@ -22,7 +22,11 @@ ruleTester.run("no-undef-init", rule, {
     valid: [
         "var a;",
         { code: "const foo = undefined", parserOptions: { ecmaVersion: 6 } },
-        "var undefined = 5; var foo = undefined;"
+        "var undefined = 5; var foo = undefined;",
+
+        // doesn't apply to class fields
+        { code: "class C { field = undefined; }", parserOptions: { ecmaVersion: 2022 } }
+
     ],
     invalid: [
         {
@@ -148,32 +152,6 @@ ruleTester.run("no-undef-init", rule, {
             output: "let a//comment\n, b;",
             parserOptions: { ecmaVersion: 6 },
             errors: [{ messageId: "unnecessaryUndefinedInit", data: { name: "a" }, type: "VariableDeclarator" }]
-        },
-
-        // Class fields
-        {
-            code: "class C { field = undefined; }",
-            output: "class C { field; }",
-            parserOptions: { ecmaVersion: 2022 },
-            errors: [{ messageId: "unnecessaryUndefinedInit", data: { name: "field" }, type: "PropertyDefinition" }]
-        },
-        {
-            code: "class C { field = undefined }",
-            output: "class C { field }",
-            parserOptions: { ecmaVersion: 2022 },
-            errors: [{ messageId: "unnecessaryUndefinedInit", data: { name: "field" }, type: "PropertyDefinition" }]
-        },
-        {
-            code: "class C { #field = undefined; }",
-            output: "class C { #field; }",
-            parserOptions: { ecmaVersion: 2022 },
-            errors: [{ messageId: "unnecessaryUndefinedInit", data: { name: "#field" }, type: "PropertyDefinition" }]
-        },
-        {
-            code: "class C { '#field' = undefined; }",
-            output: "class C { '#field'; }",
-            parserOptions: { ecmaVersion: 2022 },
-            errors: [{ messageId: "unnecessaryUndefinedInit", data: { name: "'#field'" }, type: "PropertyDefinition" }]
         }
     ]
 });