Merge branch 'master' into ElliotM-for-loop-indices

idea/testData/intentions/convertToBlockBody/annotatedExpr.kt

@@ -1,3 +1,4 @@
+target(AnnotationTarget.EXPRESSION)
 annotation class ann
 
 fun foo(): Int = <caret>@ann 1

idea/testData/intentions/convertToBlockBody/annotatedExpr.kt.after

@@ -1,3 +1,4 @@
+target(AnnotationTarget.EXPRESSION)
 annotation class ann
 
 fun foo(): Int {

idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt

@@ -1,4 +1,4 @@
-fun foo(c: kotlin.support.AbstractIterator<kotlin.concurrent.FunctionalList<Int>>) {
+fun foo(c: kotlin.support.AbstractIterator<kotlin.properties.ObservableProperty<Int>>) {
     ba<caret>r(c)
 }
 

idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt.after

@@ -1,8 +1,8 @@
-import kotlin.concurrent.FunctionalList
+import kotlin.properties.ObservableProperty
 import kotlin.support.AbstractIterator
 
-fun foo(c: kotlin.support.AbstractIterator<kotlin.concurrent.FunctionalList<Int>>) {
-    bar<AbstractIterator<FunctionalList<Int>>>(c)
+fun foo(c: kotlin.support.AbstractIterator<kotlin.properties.ObservableProperty<Int>>) {
+    bar<AbstractIterator<ObservableProperty<Int>>>(c)
 }
 
 fun <T> bar(t: T): T = t

idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt.after

@@ -4,5 +4,5 @@ public class TestingUse {
 }
 
 fun main() {
-    val funcInfunc = TestingUse().test6({ f -> f(5) > 20}, {x -> x + 2})
+    val funcInfunc = TestingUse().test6({ f -> f(5) > 20}, { x -> x + 2})
 }

idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt.after

@@ -4,5 +4,5 @@ public class TestingUse {
 }
 
 fun main() {
-    val funcInfunc = TestingUse().test6({ f: (Int) -> Int -> f(5) > 20}, {x -> x + 2})
+    val funcInfunc = TestingUse().test6({ f: (Int) -> Int -> f(5) > 20}, { x -> x + 2})
 }

idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after

@@ -3,7 +3,7 @@
 import java.util.HashMap
 
 fun foo(map : HashMap<String, Int>) {
-    for (entry: MutableMap.MutableEntry<String, Int>?<caret> in map.entrySet()) {
+    for (entry: MutableMap.MutableEntry<String, Int><caret> in map.entrySet()) {
 
     }
 }

idea/testData/intentions/usePropertyAccessSyntax/.intention

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

idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstance.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+import java.io.File
+
+class MyFile : File("file")
+
+fun foo(file: MyFile) {
+    file.getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstance.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+import java.io.File
+
+class MyFile : File("file")
+
+fun foo(file: MyFile) {
+    file.absolutePath<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstanceWithOverride.kt

@@ -0,0 +1,12 @@
+// WITH_RUNTIME
+import java.io.File
+
+class MyFile : File("file") {
+    override fun getCanonicalFile(): File {
+        return super.getCanonicalFile()
+    }
+}
+
+fun foo(file: MyFile) {
+    file.getCanonicalFile()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstanceWithOverride.kt.after

@@ -0,0 +1,12 @@
+// WITH_RUNTIME
+import java.io.File
+
+class MyFile : File("file") {
+    override fun getCanonicalFile(): File {
+        return super.getCanonicalFile()
+    }
+}
+
+fun foo(file: MyFile) {
+    file.canonicalFile<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/conflict1.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+import java.io.File
+
+fun File.foo(absolutePath: String) {
+    getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/conflict2.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+import java.io.File
+
+val File.absolutePath: String get() = ""
+
+fun foo(file: File) {
+    file.getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/genericClassMethod.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(klass: Class<*>) {
+    klass.getEnclosingClass()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/genericClassMethod.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(klass: Class<*>) {
+    klass.enclosingClass<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/get.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(file: File) {
+    file.getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/get.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(file: File) {
+    file.absolutePath<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/getImplicitReceiver.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun File.foo() {
+    getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/getImplicitReceiver.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun File.foo() {
+    absolutePath<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/getSafeCall.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(file: File?) {
+    file?.getAbsolutePath()<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/getSafeCall.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(file: File?) {
+    file?.absolutePath<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/isGet.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.<caret>isDaemon()
+}

idea/testData/intentions/usePropertyAccessSyntax/isGet.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.<caret>isDaemon
+}

idea/testData/intentions/usePropertyAccessSyntax/isSet.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.<caret>setDaemon(true)
+}

idea/testData/intentions/usePropertyAccessSyntax/isSet.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.<caret>isDaemon = true
+}

idea/testData/intentions/usePropertyAccessSyntax/set.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.setName("name")<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/set.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread) {
+    thread.name = "name"<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/setImplicitReceiver.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun Thread.foo() {
+    setName("name")<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/setImplicitReceiver.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun Thread.foo() {
+    name = "name"<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/setSafeCall.kt

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread?) {
+    thread?.setName("name")<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/setSafeCall.kt.after

@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo(thread: Thread?) {
+    thread?.name = "name"<caret>
+}

idea/testData/intentions/usePropertyAccessSyntax/smartCast.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(o: Any) {
+    if (o is File) {
+        o.getAbsolutePath()<caret>
+    }
+}

idea/testData/intentions/usePropertyAccessSyntax/smartCast.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+import java.io.File
+
+fun foo(o: Any) {
+    if (o is File) {
+        o.absolutePath<caret>
+    }
+}

idea/testData/intentions/usePropertyAccessSyntax/superCall.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+import java.io.File
+
+class MyFile : File("file") {
+    override fun getCanonicalFile(): File {
+        return super.getCanonicalFile()<caret>
+    }
+}