Merge pull request #621 from Exelord/fix/ignore-this-expressions

Fix false positive with `ignoreNonThisExpressions` option in `use-ember-get-and-set` rule
ember-cli · Dec 6, 2019 · 4c6aedd · 4c6aedd
2 parents b3d07e1 + ed6301a
commit 4c6aedd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/rules/use-ember-get-and-set.js b/lib/rules/use-ember-get-and-set.js
@@ -128,17 +128,17 @@ module.exports = {
         ) {
           return;
         }
+
         // Skip calls made on this
         if (options.ignoreThisExpressions && isThisExpression(callee.object)) {
           return;
         }
-        // Only lint calls made on this
-        if (options.ignoreNonThisExpressions && isThisExpression(callee.object)) {
-          report(node);
-          return;
-        } else if (options.ignoreNonThisExpressions) {
+
+        // Skip calls made on non this expression
+        if (options.ignoreNonThisExpressions && !isThisExpression(callee.object)) {
           return;
         }
+
         // Skip calls made on Ember methods
         if (isIdentifier(callee.object) && callee.object.name === emberImportAliasName) {
           return;

diff --git a/tests/lib/rules/use-ember-get-and-set.js b/tests/lib/rules/use-ember-get-and-set.js
@@ -60,6 +60,11 @@ eslintTester.run('use-ember-get-and-set', rule, {
       parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       options: [{ ignoreNonThisExpressions: true }],
     },
+    {
+      code: 'this.test("ok")',
+      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
+      options: [{ ignoreNonThisExpressions: true }],
+    },
 
     // ignoreThisExpressions
     {