Merge pull request #321 from dapetcu21/master

Fix crash on incomplete class property declaration (fixes #317)
jsx-eslint · Nov 18, 2015 · 25e05b8 · 25e05b8
2 parents e31b735 + c223c2d
commit 25e05b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/rules/jsx-sort-prop-types.js b/lib/rules/jsx-sort-prop-types.js
@@ -24,10 +24,8 @@ module.exports = function(context) {
     // (babel-eslint does not expose property name so we have to rely on tokens)
     if (node.type === 'ClassProperty') {
       var tokens = context.getFirstTokens(node, 2);
-      if (tokens[0].value === 'propTypes' || tokens[1].value === 'propTypes') {
-        return true;
-      }
-      return false;
+      return (tokens[0] && tokens[0].value === 'propTypes') ||
+             (tokens[1] && tokens[1].value === 'propTypes');
     }
 
     return Boolean(

diff --git a/lib/rules/sort-comp.js b/lib/rules/sort-comp.js
@@ -132,7 +132,7 @@ module.exports = Components.detect(function(context, components) {
     // (babel-eslint does not expose property name so we have to rely on tokens)
     if (node.type === 'ClassProperty') {
       var tokens = context.getFirstTokens(node, 2);
-      return tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
+      return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
     }
 
     return node.key.name;