Fixes #34. Handle unreachable return or throw.

eslint-community · Nov 4, 2016 · b2bf625 · b2bf625
1 parent a6d66a8
commit b2bf625
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/rules/always-return.js b/rules/always-return.js
@@ -72,7 +72,10 @@ module.exports = {
     function markCurrentBranchAsGood () {
       var funcInfo = peek(funcInfoStack)
       var currentBranchID = peek(funcInfo.branchIDStack)
-      funcInfo.branchInfoMap[currentBranchID].good = true
+      if (funcInfo.branchInfoMap[currentBranchID]) {
+        funcInfo.branchInfoMap[currentBranchID].good = true
+      }
+      // else unreachable code
     }
 
     return {

diff --git a/test/always-return.test.js b/test/always-return.test.js
@@ -24,6 +24,7 @@ ruleTester.run('always-return', rule, {
     { code: 'hey.then(x => { var f = function() { }; return f; })', parserOptions: parserOptions },
     { code: 'hey.then(x => { if (x) { return x; } else { return x; } })', parserOptions: parserOptions },
     { code: 'hey.then(x => { return x; var y = "unreachable"; })', parserOptions: parserOptions },
+    { code: 'hey.then(x => { return x; return "unreachable"; })', parserOptions: parserOptions },
     { code: 'hey.then(x => { return; }, err=>{ log(err); })', parserOptions: parserOptions },
     { code: 'hey.then(x => { return x && x(); }, err=>{ log(err); })', parserOptions: parserOptions },
     { code: 'hey.then(x => { return x.y || x(); }, err=>{ log(err); })', parserOptions: parserOptions }