Merge pull request #2107 from Marsup/func-names-es6-class

Fix: func-names with ES6 classes (fixes #2103)
eslint · Mar 19, 2015 · 1626126 · 1626126
2 parents 7bdb3d8 + 2a27f1e
commit 1626126
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/rules/func-names.js b/lib/rules/func-names.js
@@ -15,15 +15,18 @@ module.exports = function(context) {
 
     /**
      * Determines whether the current FunctionExpression node is a get, set, or
-     * shorthand method in an object literal.
+     * shorthand method in an object literal or a class.
      * @returns {boolean} True if the node is a get, set, or shorthand method.
      */
-    function isObjectMethod() {
+    function isObjectOrClassMethod() {
         var parent = context.getAncestors().pop();
-        return (parent.type === "Property" && (
-            parent.method ||
-            parent.kind === "get" ||
-            parent.kind === "set"
+
+        return (parent.type === "MethodDefinition" || (
+            parent.type === "Property" && (
+                parent.method ||
+                parent.kind === "get" ||
+                parent.kind === "set"
+            )
         ));
     }
 
@@ -32,7 +35,7 @@ module.exports = function(context) {
 
             var name = node.id && node.id.name;
 
-            if (!name && !isObjectMethod()) {
+            if (!name && !isObjectOrClassMethod()) {
                 context.report(node, "Missing function expression name.");
             }
         }

diff --git a/tests/lib/rules/func-names.js b/tests/lib/rules/func-names.js
@@ -30,6 +30,10 @@ eslintTester.addRuleTest("lib/rules/func-names", {
         {
             code: "({ foo() { return 1; } });",
             ecmaFeatures: { objectLiteralShorthandMethods: true }
+        },
+        {
+            code: "class A { constructor(){} foo(){} get bar(){} set baz(value){} static qux(){}}",
+            ecmaFeatures: { classes: true }
         }
     ],
     invalid: [