Cyclomatic complexity: skip the DO token

DO comes either with WHILE or FOR, and both are already counted.

Author: Albert Meltzer

src/main/scala/org/scalastyle/scalariform/CyclomaticComplexityChecker.scala

@@ -18,7 +18,6 @@ package org.scalastyle.scalariform
 
 import _root_.scalariform.lexer.Token
 import _root_.scalariform.lexer.Tokens.CASE
-import _root_.scalariform.lexer.Tokens.DO
 import _root_.scalariform.lexer.Tokens.FOR
 import _root_.scalariform.lexer.Tokens.IF
 import _root_.scalariform.lexer.Tokens.MATCH
@@ -39,7 +38,7 @@ class CyclomaticComplexityChecker extends CombinedChecker {
   val DefaultCountCases = true
   private lazy val maximum = getInt("maximum", DefaultMaximum)
   private lazy val countCases = getBoolean("countCases", DefaultCountCases)
-  private val defaultTokens = Set(IF, WHILE, DO, FOR)
+  private val defaultTokens = Set(IF, WHILE, FOR)
 
   case class FunDefOrDclClazz(t: FunDefOrDcl, position: Option[Int], subs: List[FunDefOrDclClazz])
       extends Clazz[FunDefOrDcl]()

src/test/scala/org/scalastyle/scalariform/CyclomaticComplexityCheckerTest.scala

@@ -39,6 +39,7 @@ class Foobar {
       5 match {
         case 4 =>
         case 5 =>
+        case 6 =>
         case _ =>
       }
     } else {
@@ -49,7 +50,6 @@ class Foobar {
       3
     }
   }
-
   def barbar(i: Int): Int = {
     if (i == 1) {
       5
@@ -65,6 +65,7 @@ class Foobar {
       while (f > 0) {}
       do {} while (f > 0)
       for (t <- List()) {}
+      for (t <- List()) yield {}
       3
     }
   }