Introduce "Redundant else in if" inspection #KT-19668 Fixed

idea/testData/inspectionsLocal/redundantElseInIf/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.RedundantElseInIfInspection

idea/testData/inspectionsLocal/redundantElseInIf/empty.kt

@@ -0,0 +1,14 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) {
+        throw SomeException()
+    } else if (y) {
+        // empty
+    } else<caret> {
+        foo()
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/inLambda.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+fun foo() {}
+fun bar() {}
+
+fun test(s: String?, b: Boolean) {
+    s?.also {
+        if (b) {
+            foo()
+            return
+        } <caret>else {
+            bar()
+            return
+        }
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/inLambda.kt.after

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+fun foo() {}
+fun bar() {}
+
+fun test(s: String?, b: Boolean) {
+    s?.also {
+        if (b) {
+            foo()
+            return
+        }
+        bar()
+        return
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/noElse.kt

@@ -0,0 +1,11 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) {
+        throw SomeException()
+    } else<caret> if (y) {
+        return
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/notNothing.kt

@@ -0,0 +1,9 @@
+// PROBLEM: none
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) foo()
+    else if (y) return
+    else<caret> bar()
+}

idea/testData/inspectionsLocal/redundantElseInIf/notReturn.kt

@@ -0,0 +1,16 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) {
+        foo()
+    } else if (y) {
+        throw SomeException()
+    } else<caret> {
+        foo()
+        bar()
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean) {
+    if (x) throw SomeException()
+    else<caret> foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean) {
+    if (x) throw SomeException()
+    foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant2.kt

@@ -0,0 +1,11 @@
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean) {
+    if (x) {
+        return
+    } else<caret> {
+        foo()
+        bar()
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant2.kt.after

@@ -0,0 +1,10 @@
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean) {
+    if (x) {
+        return
+    }
+    foo()
+    bar()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant3.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) throw SomeException()
+    else if (y) return
+    else<caret> foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant3.kt.after

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) throw SomeException()
+    else if (y) return
+    foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant4.kt

@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) {
+        return
+    } else if (y) {
+        throw SomeException()
+    } else<caret> {
+        // comment1
+        foo()
+        // comment2
+        bar()
+    }
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundant4.kt.after

@@ -0,0 +1,16 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+fun bar(): Int = 2
+
+fun test(x: Boolean, y: Boolean) {
+    if (x) {
+        return
+    } else if (y) {
+        throw SomeException()
+    }
+    // comment1
+    foo()
+    // comment2
+    bar()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundantSingleLine.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean): Int {
+    if (x) throw SomeException() else<caret> return foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundantSingleLine.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean): Int {
+    if (x) throw SomeException()
+    return foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundantSingleLine2.kt

@@ -0,0 +1,11 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Int): Int {
+    if (x == 1) {
+        throw SomeException()
+    } else if (x == 2) {
+        throw SomeException()
+    } <caret>else return foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/redundantSingleLine2.kt.after

@@ -0,0 +1,12 @@
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Int): Int {
+    if (x == 1) {
+        throw SomeException()
+    } else if (x == 2) {
+        throw SomeException()
+    }
+    return foo()
+}

idea/testData/inspectionsLocal/redundantElseInIf/usedAsExpression.kt

@@ -0,0 +1,10 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class SomeException : RuntimeException()
+fun foo(): Int = 1
+
+fun test(x: Boolean, y: Boolean) {
+    val i: Int = if (x) throw SomeException()
+    else if (y) return
+    else<caret> foo()
+}