Skip to content

Commit 7d318d0

Browse files
committed
Fix ignoreNonThisExpressions
1 parent d1fbb93 commit 7d318d0

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

lib/rules/use-ember-get-and-set.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,17 @@ module.exports = {
128128
) {
129129
return;
130130
}
131+
131132
// Skip calls made on this
132133
if (options.ignoreThisExpressions && isThisExpression(callee.object)) {
133134
return;
134135
}
135-
// Only lint calls made on this
136-
if (options.ignoreNonThisExpressions && isThisExpression(callee.object)) {
137-
report(node);
138-
return;
139-
} else if (options.ignoreNonThisExpressions) {
136+
137+
// Skip calls made on non this expression
138+
if (options.ignoreNonThisExpressions && !isThisExpression(callee.object)) {
140139
return;
141140
}
141+
142142
// Skip calls made on Ember methods
143143
if (isIdentifier(callee.object) && callee.object.name === emberImportAliasName) {
144144
return;

tests/lib/rules/use-ember-get-and-set.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ eslintTester.run('use-ember-get-and-set', rule, {
6060
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
6161
options: [{ ignoreNonThisExpressions: true }],
6262
},
63+
{
64+
code: 'this.test("ok")',
65+
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
66+
options: [{ ignoreNonThisExpressions: true }]
67+
},
6368

6469
// ignoreThisExpressions
6570
{

0 commit comments

Comments
 (0)