Skip to content

Commit

Permalink
Fix require-render-return crash (fixes #589)
Browse files Browse the repository at this point in the history
  • Loading branch information
yannickcr committed May 9, 2016
1 parent ef16a76 commit 0db010d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/rules/require-render-return.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ module.exports = Components.detect(function(context, components, utils) {
if (node.type === 'ClassProperty') {
var tokens = context.getFirstTokens(node, 2);
return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
} else if (['MethodDefinition', 'Property'].indexOf(node.type) !== -1) {
return node.key.name;
}

return node.key.name;
return '';
}

/**
Expand Down
9 changes: 9 additions & 0 deletions tests/lib/rules/require-render-return.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ ruleTester.run('require-render-return', rule, {
'}'
].join('\n'),
parserOptions: parserOptions
}, {
// Stateless arrow function
code: [
'var Hello = () => (',
' <div></div>',
');'
].join('\n'),
parser: 'babel-eslint',
parserOptions: parserOptions
}, {
// Return in a switch...case
code: [
Expand Down

0 comments on commit 0db010d

Please sign in to comment.