Added second quickfix on conflicting extension to mark it hidden and deprecated

idea/testData/quickfix/migration/conflictingExtension/.inspection

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

idea/testData/quickfix/migration/conflictingExtension/explicitThis.kt

@@ -0,0 +1,7 @@
+// "Delete redundant extension property" "true"
+
+var Thread.<caret>priority: Int
+    get() = this.getPriority()
+    set(value) {
+        this.setPriority(value)
+    }

idea/testData/quickfix/migration/conflictingExtension/explicitThis.kt.after

@@ -0,0 +1,2 @@
+// "Delete redundant extension property" "true"
+

idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt

@@ -0,0 +1,5 @@
+// "Mark with @HiddenDeclaration and @deprecated" "true"
+import java.io.File
+
+val File.<caret>name: String
+    get() = getName()

idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt.after

@@ -0,0 +1,7 @@
+// "Mark with @HiddenDeclaration and @deprecated" "true"
+import java.io.File
+
+@HiddenDeclaration
+@deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"))
+val File.<caret>name: String
+    get() = getName()

idea/testData/quickfix/migration/conflictingExtension/memberExtension.kt

@@ -0,0 +1,7 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+
+class C {
+    val File.<caret>name: String
+        get() = getName()
+}

idea/testData/quickfix/migration/conflictingExtension/memberExtension.kt.after

@@ -0,0 +1,5 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+
+class C {
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.after.JustImport.kt

@@ -0,0 +1,4 @@
+package test
+
+fun foo() {
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.after.StarImport.kt

@@ -0,0 +1,8 @@
+package test
+
+import java.io.File
+import utils.*
+
+fun foo(file: File) {
+    print(file.name)
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.after.Usages.kt

@@ -0,0 +1,7 @@
+package test
+
+import java.io.File
+
+fun foo(file: File) {
+    print(file.name)
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.after.kt

@@ -0,0 +1,6 @@
+// "Delete redundant extension property" "true"
+package utils
+
+import java.io.File
+
+// WITH_RUNTIME

idea/testData/quickfix/migration/conflictingExtension/removeImports.before.JustImport.kt

@@ -0,0 +1,6 @@
+package test
+
+import utils.name
+
+fun foo() {
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.before.Main.kt

@@ -0,0 +1,9 @@
+// "Delete redundant extension property" "true"
+package utils
+
+import java.io.File
+
+val File.<caret>name: String
+    get() = getName()
+
+// WITH_RUNTIME

idea/testData/quickfix/migration/conflictingExtension/removeImports.before.StarImport.kt

@@ -0,0 +1,8 @@
+package test
+
+import java.io.File
+import utils.*
+
+fun foo(file: File) {
+    print(file.name)
+}

idea/testData/quickfix/migration/conflictingExtension/removeImports.before.Usages.kt

@@ -0,0 +1,8 @@
+package test
+
+import java.io.File
+import utils.name
+
+fun foo(file: File) {
+    print(file.name)
+}

idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.after.Usages.kt

@@ -0,0 +1,9 @@
+package test
+
+import java.io.File
+import utils.name
+
+fun foo(file: File, thread: Thread) {
+    print(file.name)
+    print(thread.name)
+}

idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.after.kt

@@ -0,0 +1,9 @@
+// "Delete redundant extension property" "true"
+package utils
+
+import java.io.File
+
+val Thread.name: String
+    get() = getName()
+
+// WITH_RUNTIME

idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.before.Main.kt

@@ -0,0 +1,12 @@
+// "Delete redundant extension property" "true"
+package utils
+
+import java.io.File
+
+val File.<caret>name: String
+    get() = getName()
+
+val Thread.name: String
+    get() = getName()
+
+// WITH_RUNTIME

idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.before.Usages.kt

@@ -0,0 +1,9 @@
+package test
+
+import java.io.File
+import utils.name
+
+fun foo(file: File, thread: Thread) {
+    print(file.name)
+    print(thread.name)
+}

idea/testData/quickfix/migration/conflictingExtension/returnInGetter.kt

@@ -0,0 +1,5 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+
+val File.<caret>name: String
+    get() { return getName() }

idea/testData/quickfix/migration/conflictingExtension/returnInGetter.kt.after

@@ -0,0 +1,3 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+

idea/testData/quickfix/migration/conflictingExtension/simple.kt

@@ -0,0 +1,5 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+
+val File.<caret>name: String
+    get() = getName()

idea/testData/quickfix/migration/conflictingExtension/simple.kt.after

@@ -0,0 +1,3 @@
+// "Delete redundant extension property" "true"
+import java.io.File
+

idea/testData/quickfix/migration/conflictingExtension/valInsteadOfVar.kt

@@ -0,0 +1,4 @@
+// "Delete redundant extension property" "true"
+
+val Thread.<caret>priority: Int
+    get() = getPriority()

idea/testData/quickfix/migration/conflictingExtension/valInsteadOfVar.kt.after

@@ -0,0 +1,2 @@
+// "Delete redundant extension property" "true"
+

idea/testData/quickfix/migration/conflictingExtension/varInsteadOfVal.kt

@@ -0,0 +1,6 @@
+// "Delete redundant extension property" "false"
+import java.io.File
+
+var File.<caret>name: String
+    get() = getName()
+    set(value) {}

idea/testData/quickfix/migration/conflictingExtension/withSetter.kt

@@ -0,0 +1,7 @@
+// "Delete redundant extension property" "true"
+
+var Thread.<caret>priority: Int
+    get() = getPriority()
+    set(value) {
+        setPriority(value)
+    }

idea/testData/quickfix/migration/conflictingExtension/withSetter.kt.after

@@ -0,0 +1,2 @@
+// "Delete redundant extension property" "true"
+

idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis.kt

@@ -0,0 +1,7 @@
+// "Delete redundant extension property" "false"
+// ACTION: Convert property to function
+
+class C : Thread() {
+    val Thread.<caret>priority: Int
+        get() = this@C.getPriority()
+}

idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis2.kt

@@ -0,0 +1,9 @@
+// "Delete redundant extension property" "false"
+
+class C : Thread() {
+    var Thread.<caret>priority: Int
+        get() = getPriority()
+        set(value) {
+            this@C.setPriority(value)
+        }
+}

idea/testData/quickfix/migration/conflictingExtension/wrongGetter.kt

@@ -0,0 +1,7 @@
+// "Delete redundant extension property" "false"
+
+var Thread.<caret>priority: Int
+  get() = getPriority() + 1
+  set(value) {
+      setPriority(value)
+  }

idea/testData/quickfix/migration/conflictingExtension/wrongGetter2.kt

@@ -0,0 +1,6 @@
+// "Delete redundant extension property" "false"
+// ACTION: Convert property to function
+import java.io.File
+
+public val File.<caret>parent: File?
+    get() = getParentFile()

idea/testData/quickfix/migration/conflictingExtension/wrongSetter.kt

@@ -0,0 +1,8 @@
+// "Delete redundant extension property" "false"
+
+var Thread.<caret>priority: Int
+    get() = this.getPriority()
+    set(value) {
+        this.setPriority(value)
+        System.out.print("set")
+    }