fixes palantir#17

cxx1994 · Aug 22, 2013 · d8e78ac · d8e78ac
1 parent 298e85d
commit d8e78ac
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -27623,6 +27623,18 @@ var Lint;
                 this.hasReturned = false;
             };
 
+            UnreachableWalker.prototype.visitCaseSwitchClause = function (node) {
+                this.hasReturned = false;
+                _super.prototype.visitCaseSwitchClause.call(this, node);
+                this.hasReturned = false;
+            };
+
+            UnreachableWalker.prototype.visitDefaultSwitchClause = function (node) {
+                this.hasReturned = false;
+                _super.prototype.visitDefaultSwitchClause.call(this, node);
+                this.hasReturned = false;
+            };
+
             UnreachableWalker.prototype.visitBreakStatement = function (node) {
                 _super.prototype.visitBreakStatement.call(this, node);
                 this.hasReturned = true;

diff --git a/lib/tslint.js b/lib/tslint.js
@@ -27623,6 +27623,18 @@ var Lint;
                 this.hasReturned = false;
             };
 
+            UnreachableWalker.prototype.visitCaseSwitchClause = function (node) {
+                this.hasReturned = false;
+                _super.prototype.visitCaseSwitchClause.call(this, node);
+                this.hasReturned = false;
+            };
+
+            UnreachableWalker.prototype.visitDefaultSwitchClause = function (node) {
+                this.hasReturned = false;
+                _super.prototype.visitDefaultSwitchClause.call(this, node);
+                this.hasReturned = false;
+            };
+
             UnreachableWalker.prototype.visitBreakStatement = function (node) {
                 _super.prototype.visitBreakStatement.call(this, node);
                 this.hasReturned = true;

diff --git a/src/rules/noUnreachableRule.ts b/src/rules/noUnreachableRule.ts
@@ -50,6 +50,18 @@ module Lint.Rules {
             this.hasReturned = false;
         }
 
+        public visitCaseSwitchClause(node: TypeScript.CaseSwitchClauseSyntax): void {
+            this.hasReturned = false;
+            super.visitCaseSwitchClause(node);
+            this.hasReturned = false;            
+        }
+
+        public visitDefaultSwitchClause(node: TypeScript.DefaultSwitchClauseSyntax): void {
+            this.hasReturned = false;
+            super.visitDefaultSwitchClause(node);
+            this.hasReturned = false;            
+        }
+
         public visitBreakStatement(node: TypeScript.BreakStatementSyntax): void {
             super.visitBreakStatement(node);
             this.hasReturned = true;

diff --git a/test/files/rules/nounreachable.test.ts b/test/files/rules/nounreachable.test.ts
@@ -39,3 +39,15 @@ var f2 = () => {
 
     return 123;
 };
+
+switch (x) {
+    case 1:
+        i = 2;
+        break;
+    case 2:
+        i = 3;
+        break;
+    default:
+        i = 4;
+        break;
+}