cyclomatic-complexity: Don't count empty switch cases (palantir#2743)

girgez · May 31, 2017 · 3da800c · 3da800c
1 parent 14bbecb
commit 3da800c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/rules/cyclomaticComplexityRule.ts b/src/rules/cyclomaticComplexityRule.ts
@@ -105,6 +105,7 @@ function walk(ctx: Lint.WalkContext<{ threshold: number }>): void {
 function increasesComplexity(node: ts.Node): boolean {
     switch (node.kind) {
         case ts.SyntaxKind.CaseClause:
+            return (node as ts.CaseClause).statements.length > 0;
         case ts.SyntaxKind.CatchClause:
         case ts.SyntaxKind.ConditionalExpression:
         case ts.SyntaxKind.DoStatement:

diff --git a/test/rules/cyclomatic-complexity/specifiedThreshold/test.ts.lint b/test/rules/cyclomatic-complexity/specifiedThreshold/test.ts.lint
@@ -136,9 +136,11 @@ function invalidBinaryExpression() {
 function validSwitch() {
     switch(5) {
         case 0:
-            return 0;
+        case 2:
+            return "even";
         case 1:
-            return 1;
+        case 3:
+            return "odd";
         default:
             return -1;
     }

diff --git a/tslint.json b/tslint.json
@@ -8,6 +8,7 @@
     "prefer-switch": [true, { "min-cases": 3 }],
 
     // Don't want these
+    "cyclomatic-complexity": false,
     "newline-before-return": false,
     "no-parameter-properties": false,
     "no-unused-variable": false,
@@ -34,7 +35,6 @@
 
     // TODO: Enable these
     "completed-docs": false,
-    "cyclomatic-complexity": false,
     "no-any": false,
     "no-magic-numbers": false,
     "no-non-null-assertion": false,