Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Output correct column number for matches-shorthand #19

Merged
merged 1 commit into from
Jan 18, 2016
Merged

Output correct column number for matches-shorthand #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/rules/matches-shorthand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ module.exports = function (context) {
var callExpressionVisitors = {
always: function (node) {
if (methodSupportsShorthand(node) && shouldPreferMatches(lodashUtil.getLodashIteratee(node))) {
context.report(node.callee.property, 'Prefer matches syntax');
context.report(lodashUtil.getLodashIteratee(node), 'Prefer matches syntax');
}
},
never: function (node) {
if (usesMatchesShorthand(node)) {
context.report(node.callee.property, 'Do not use matches syntax');
context.report(lodashUtil.getLodashIteratee(node), 'Do not use matches syntax');
}
}
};
Expand All @@ -80,4 +80,4 @@ module.exports.schema = [
}, {
type: 'boolean'
}
];
];
28 changes: 14 additions & 14 deletions tests/lib/rules/matches-shorthand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ var RuleTester = require('eslint').RuleTester;
// ------------------------------------------------------------------------------

var ruleTester = new RuleTester();
var errors = {
always: [{message: 'Prefer matches syntax'}],
never: [{message: 'Do not use matches syntax'}]
var messages = {
always: 'Prefer matches syntax',
never: 'Do not use matches syntax'
};
ruleTester.run('matches-shorthand', rule, {
valid: [
Expand All @@ -28,44 +28,44 @@ ruleTester.run('matches-shorthand', rule, {
],
invalid: [{
code: 'var isPublic = _.find([], function (i) { return i.id === 3; });',
errors: errors.always
errors: [{message: messages.always, column: 27}]
}, {
code: 'var isPublic = _.detect([], function (i) { return i.id === 3 && i.a === "string" && {a: 10} === i.b;});',
errors: errors.always
errors: [{message: messages.always, column: 29}]
}, {
code: 'var isPublic = _.filter(arr, i => i.id === 3)',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 30}]
}, {
code: 'var isPublic = _.select(arr, i => i.id === 3 && i.a === "string" && {a: 10} === i.b)',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 30}]
}, {
code: 'var isPublic = _.findIndex(arr, (i) => {return i.id === 3})',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 33}]
}, {
code: 'var isPublic = _.some(arr, (i) => {return i.id === 3 && i.a === "string" && {a: 10} === i.b})',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 28}]
}, {
code: 'var isPublic = _.every(arr, (i) => {return i.id === b.id})',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 29}]
}, {
code: 'var isPublic = _.find([], i => i[0] === 3);',
ecmaFeatures: {arrowFunctions: true},
errors: errors.always
errors: [{message: messages.always, column: 27}]
}, {
code: '_.findLastIndex(arr, function(i) { return i[b].c === compId; });',
options: ['always', 3, true],
errors: errors.always
errors: [{message: messages.always, column: 22}]
}, {
code: '_.findLastIndex(arr, function(i) { return i.b.c === compId; });',
errors: errors.always
errors: [{message: messages.always, column: 22}]
}, {
code: '_.findLastIndex(arr, {b: {c: compId}});',
options: ['never'],
errors: errors.never
errors: [{message: messages.never, column: 22}]
}]
});