Merge branch 'rr/valentin/for-loop-indices'

idea/testData/intentions/addForLoopIndices/.intention

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.AddForLoopIndicesIntention

idea/testData/intentions/addForLoopIndices/explicitParamType.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun a() {
+    val b = listOf(1,2,3,4,5)
+    for (<caret>c : Int in b) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/explicitParamType.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun a() {
+    val b = listOf(1,2,3,4,5)
+    for ((index, c : Int) in b.withIndex()) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+fun b(c: List<String>) {
+    for ((<caret>indexVariable, d) in c.withIndex()) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/inapplicableInBody.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+fun foo() {
+    for (a in listOf(1, 2, 3)) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: FALSE
+// WITH_RUNTIME
+fun foo(bar: Map<String, String>) {
+    for (a <caret>in bar) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: FALSE
+fun String.withIndex(): Int = 42
+
+fun foo(s: String) {
+    for (<caret>a in s) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+// ERROR: Unresolved reference: b
+fun foo() {
+    for (a <caret>in b) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/intArray.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: IntArray) {
+    for (<caret>a in bar) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/intArray.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: IntArray) {
+    for ((index, a) in bar.withIndex()) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/iterable.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: Iterable<Int>) {
+    for (<caret>a in bar) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/iterable.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: Iterable<Int>) {
+    for ((index, a) in bar.withIndex()) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/noBody.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: IntArray) {
+    for (<caret>a in bar)
+}

idea/testData/intentions/addForLoopIndices/noBody.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(bar: IntArray) {
+    for ((index, a) in bar.withIndex())<caret>
+}

idea/testData/intentions/addForLoopIndices/objectArray.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: Array<Object>) {
+    for (<caret>a in bar) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/objectArray.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: Array<Object>) {
+    for ((index, a) in bar.withIndex()) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/sequence.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+fun foo(bar: Sequence<String>) {
+    for (<caret>a in bar)
+        print(a)
+}

idea/testData/intentions/addForLoopIndices/sequence.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+fun foo(bar: Sequence<String>) {
+    for ((index, a) in bar.withIndex())
+        <caret>print(a)
+}

idea/testData/intentions/addForLoopIndices/simpleIntList.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun a() {
+    val b = listOf(1,2,3,4,5)
+    for (<caret>c in b) {
+
+    }
+}

idea/testData/intentions/addForLoopIndices/simpleIntList.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun a() {
+    val b = listOf(1,2,3,4,5)
+    for ((index, c) in b.withIndex()) {<caret>
+
+    }
+}

idea/testData/intentions/addForLoopIndices/string.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: String) {
+    for (<caret>a in bar) {
+        print(a)
+    }
+}

idea/testData/intentions/addForLoopIndices/string.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: String) {
+    for ((index, a) in bar.withIndex()) {
+        <caret>print(a)
+    }
+}

idea/testData/intentions/removeForLoopIndices/.intention

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.RemoveForLoopIndicesIntention

idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt

@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+fun foo(bar: List<String>) {
+    for (<caret>a in bar) {
+
+    }
+}

idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: FALSE
+// WITH_RUNTIME
+
+fun foo(b: List<Int>) : Int {
+    for ((<caret>i, c) in b.withIndex()) {
+        return i
+    }
+    return 0
+}

idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt

@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: FALSE
+
+fun Int.withIndex(): List<Pair<Int, Int>> = linkedListOf<Pair<Int, Int>>()
+
+fun foo(s: Int) {
+    for ((index<caret>, a) in s.withIndex()) {
+
+    }
+}

idea/testData/intentions/removeForLoopIndices/loopWithType.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: List<Int>) {
+    for ((i<caret> : Int, b: Int) in bar.withIndex()) {
+
+    }
+}

idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: List<Int>) {
+    for (b: Int in bar) {
+
+    }
+}

idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: List<String>) {
+    for ((i<caret>,a) in bar.withIndex()) {
+
+    }
+}

idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo(bar: List<String>) {
+    for (a in bar) {
+
+    }
+}