Convert ConvertTwoComparisonsToRangeCheck intention to inspection

Relates to #KT-17310

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/.inspection

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

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Char) {
+    bar >= 'a' && 'z' >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Char) {
+    bar in 'a'..'z'
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Char) {
+    bar > 'a' && 'z' > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Char) {
+    bar in 'b'..'y'
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInt.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+// DISABLE-ERRORS
+fun foo(bar: Char) {
+    bar > 1 && 2 > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+class A(val _value: Int): Comparable<A> {
+    override operator fun compareTo(other: A) = _value.compareTo(other._value)
+}
+
+val low = A(0)
+val high = A(100)
+fun test(a: A): Boolean {
+    return low <= a && a <= high<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt.after

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+class A(val _value: Int): Comparable<A> {
+    override operator fun compareTo(other: A) = _value.compareTo(other._value)
+}
+
+val low = A(0)
+val high = A(100)
+fun test(a: A): Boolean {
+    return a in low..high
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt

@@ -0,0 +1,9 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class A(val _value: Int) {
+    operator fun compareTo(other: Int) = _value.compareTo(other)
+}
+
+fun test(a: A): Boolean {
+    return a >= 0 && a <= 100<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToSameType.kt

@@ -0,0 +1,11 @@
+// PROBLEM: none
+// WITH_RUNTIME
+class A(val _value: Int) {
+    operator fun compareTo(other: A) = _value.compareTo(other._value)
+}
+
+val low = A(0)
+val high = A(100)
+fun test(a: A): Boolean {
+    return low <= a && a <= high<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Int) {
+    bar >= 0.0 && 10.0 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Int) {
+    bar in 0.0..10.0
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Double) {
+    0 <= bar && bar <= 10.0<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Double) {
+    bar in 0.0..10.0
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Double) {
+    0 <= bar && bar <= 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Double) {
+    bar in 0.0..10.0
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt

@@ -0,0 +1 @@
+fun foo(arg: Int) = 6 > arg && arg >= 1<caret>

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt.after

@@ -0,0 +1 @@
+fun foo(arg: Int) = arg in 1..5

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt

@@ -0,0 +1,6 @@
+// PROBLEM: none
+
+var x = 42
+
+// Should be converted into arg in --x..++x (41..42) but initial check is arg <= ++x (43) && --x (42) <= arg
+fun foo(arg: Int) = <caret>arg <= ++x && --x <= arg

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+// WITH_RUNTIME
+fun foo(bar: Int) {
+    bar > 0.0 && 10.0 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble2.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+// WITH_RUNTIME
+fun foo(bar: Double) {
+    bar > 0 && 10 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar >= 0 && 10 > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar >= 0 && 10 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar >= 0 && bar < 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar >= 0 && bar <= 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar > 0 && 10 > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar > 0 && 10 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar > 0 && bar < 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar > 0 && bar <= 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 <= bar && 10 > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 <= bar && 10 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 <= bar && bar < 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 <= bar && bar <= 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 0..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 < bar && 10 > bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 < bar && 10 >= bar<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 < bar && bar < 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..9
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    0 < bar && bar <= 10<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt.after

@@ -0,0 +1,3 @@
+fun foo(bar: Int) {
+    bar in 1..10
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Int, min: Int, max: Int) {
+    min < bar && bar < max<caret>
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: Int, min: Int, max: Int) {
+    bar in (min + 1) until max
+}

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+val N = 42
+fun test(a: Int) = a >= 0 && a < N<caret>

idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+val N = 42
+fun test(a: Int) = a in 0 until N