Update: support class fields in func-name-matching (refs #14857) (#14964

)
eslint · Aug 24, 2021 · 44c6fc8 · 44c6fc8
1 parent 44f7de5
commit 44c6fc8
Show file tree

Hide file tree

Showing 3 changed files with 371 additions and 5 deletions.
diff --git a/docs/rules/func-name-matching.md b/docs/rules/func-name-matching.md
@@ -15,6 +15,10 @@ obj.foo = function bar() {};
 obj['foo'] = function bar() {};
 var obj = {foo: function bar() {}};
 ({['foo']: function bar() {}});
+
+class C {
+    foo = function bar() {};
+}
 ```
 
 ```js
@@ -26,6 +30,10 @@ obj.foo = function foo() {};
 obj['foo'] = function foo() {};
 var obj = {foo: function foo() {}};
 ({['foo']: function foo() {}});
+
+class C {
+    foo = function foo() {};
+}
 ```
 
 Examples of **correct** code for this rule:
@@ -54,6 +62,21 @@ obj['x' + 2] = function bar(){};
 var [ bar ] = [ function bar(){} ];
 ({[foo]: function bar() {}})
 
+class C {
+    foo = function foo() {};
+    baz = function() {};
+}
+
+// private names are ignored
+class D {
+    #foo = function foo() {};
+    #bar = function foo() {};
+    baz() {
+        this.#foo = function foo() {};
+        this.#foo = function bar() {};
+    }
+}
+
 module.exports = function foo(name) {};
 module['exports'] = function foo(name) {};
 ```
@@ -81,6 +104,21 @@ obj['x' + 2] = function bar(){};
 var [ bar ] = [ function bar(){} ];
 ({[foo]: function bar() {}})
 
+class C {
+    foo = function bar() {};
+    baz = function() {};
+}
+
+// private names are ignored
+class D {
+    #foo = function foo() {};
+    #bar = function foo() {};
+    baz() {
+        this.#foo = function foo() {};
+        this.#foo = function bar() {};
+    }
+}
+
 module.exports = function foo(name) {};
 module['exports'] = function foo(name) {};
 ```

diff --git a/lib/rules/func-name-matching.js b/lib/rules/func-name-matching.js
@@ -195,21 +195,25 @@ module.exports = {
                 const isProp = node.left.type === "MemberExpression";
                 const name = isProp ? astUtils.getStaticPropertyName(node.left) : node.left.name;
 
-                if (node.right.id && isIdentifier(name) && shouldWarn(name, node.right.id.name)) {
+                if (node.right.id && name && isIdentifier(name) && shouldWarn(name, node.right.id.name)) {
                     report(node, name, node.right.id.name, isProp);
                 }
             },
 
-            Property(node) {
-                if (node.value.type !== "FunctionExpression" || !node.value.id || node.computed && !isStringLiteral(node.key)) {
+            "Property, PropertyDefinition[value]"(node) {
+                if (!(node.value.type === "FunctionExpression" && node.value.id)) {
                     return;
                 }
 
-                if (node.key.type === "Identifier") {
+                if (node.key.type === "Identifier" && !node.computed) {
                     const functionName = node.value.id.name;
                     let propertyName = node.key.name;
 
-                    if (considerPropertyDescriptor && propertyName === "value") {
+                    if (
+                        considerPropertyDescriptor &&
+                        propertyName === "value" &&
+                        node.parent.type === "ObjectExpression"
+                    ) {
                         if (isPropertyCall("Object", "defineProperty", node.parent.parent) || isPropertyCall("Reflect", "defineProperty", node.parent.parent)) {
                             const property = node.parent.parent.arguments[1];