Merge pull request #28 from Doist/afzal/fix.consistent_when_multiline

Don't report when entries with multiple conditions and trailing comma

src/main/kotlin/com/doist/detekt/ConsistentWhenEntries.kt

@@ -33,5 +33,5 @@ class ConsistentWhenEntries(config: Config) : Rule(config) {
         }
     }
 
-    private fun KtWhenEntry.isMultiline() = text.count { it == '\n' } > 1
+    private fun KtWhenEntry.isMultiline() = (expression?.text?.count { it == '\n' } ?: 0) > 1
 }

src/test/kotlin/com/doist/detekt/ConsistentWhenEntriesTest.kt

@@ -53,4 +53,38 @@ internal class ConsistentWhenEntriesTest(private val env: KotlinCoreEnvironment)
         val findings = rule.compileAndLintWithContext(env, code)
         findings shouldHaveSize 0
     }
+
+    @Test
+    fun `doesn't report single line when entries with multiple conditions and trailing comma`() {
+        val code = """
+            val a = listOf<Int>()
+            val b = when(a) {
+                is ArrayList,
+                is MutableList,
+                -> true
+                else -> false
+            }
+        """
+        val rule = ConsistentWhenEntries(Config.empty)
+        val findings = rule.compileAndLintWithContext(env, code)
+        findings shouldHaveSize 0
+    }
+
+    @Test
+    fun `report inconsistent when entries with multiple conditions and trailing comma`() {
+        val code = """
+            val a = listOf<Int>()
+            val b = when(a) {
+                is ArrayList,
+                is MutableList,
+                -> {
+                    true
+                }
+                else -> false
+            }
+        """
+        val rule = ConsistentWhenEntries(Config.empty)
+        val findings = rule.compileAndLintWithContext(env, code)
+        findings shouldHaveSize 1
+    }
 }