Implement "Safe Delete" refactoring for properties

idea/testData/safeDelete/deleteJavaProperty/middleJava1.java

@@ -0,0 +1,6 @@
+abstract class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava1.java.after

@@ -0,0 +1,2 @@
+abstract class C implements B {
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt.after

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava2.java

@@ -0,0 +1,6 @@
+class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt.messages

@@ -0,0 +1 @@
+method C.getFoo() implements method B.getFoo().

idea/testData/safeDelete/deleteJavaProperty/middleJava3.java

@@ -0,0 +1,11 @@
+abstract class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava3.java.after

@@ -0,0 +1,7 @@
+abstract class C implements B {
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt.after

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava4.java

@@ -0,0 +1,11 @@
+class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt.messages

@@ -0,0 +1 @@
+method C.getFoo() implements method B.getFoo().

idea/testData/safeDelete/deleteJavaProperty/middleJava5.java

@@ -0,0 +1,11 @@
+abstract class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void <caret>setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava5.java.after

@@ -0,0 +1,7 @@
+abstract class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt.after

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava6.java

@@ -0,0 +1,11 @@
+class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void <caret>setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt.messages

@@ -0,0 +1 @@
+method C.setFoo(String) implements method B.setFoo(String).

idea/testData/safeDelete/deleteProperty/implement1.kt

@@ -0,0 +1,10 @@
+trait A {
+    val foo: String
+}
+
+class B: A {
+    override val <caret>foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/implement1.kt.messages

@@ -0,0 +1 @@
+val foo: jet.String in final class B : A implements val foo: jet.String in trait A.

idea/testData/safeDelete/deleteProperty/implement2.kt

@@ -0,0 +1,14 @@
+trait A {
+    val foo: String
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A, Z {
+    override val <caret>foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/implement2.kt.messages

@@ -0,0 +1,2 @@
+val foo: jet.String in final class B : A, Z implements val foo: jet.String in trait A.
+val foo: jet.String in final class B : A, Z implements val foo: jet.String in trait Z.

idea/testData/safeDelete/deleteProperty/implement3.kt

@@ -0,0 +1,13 @@
+trait A {
+    var foo: String
+}
+
+class B: A {
+    override var <caret>foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/implement3.kt.messages

@@ -0,0 +1 @@
+var foo: jet.String in final class B : A implements var foo: jet.String in trait A.

idea/testData/safeDelete/deleteProperty/implement4.kt

@@ -0,0 +1,17 @@
+trait A {
+    var foo: String
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A, Z {
+    override var <caret>foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/implement4.kt.messages

@@ -0,0 +1,2 @@
+var foo: jet.String in final class B : A, Z implements var foo: jet.String in trait A.
+var foo: jet.String in final class B : A, Z implements var foo: jet.String in trait Z.

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt

@@ -0,0 +1,10 @@
+trait A {
+    val <caret>foo: String
+}
+
+class B: A {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt.after

@@ -0,0 +1,5 @@
+trait A {
+}
+
+class B: A {
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt

@@ -0,0 +1,13 @@
+trait A {
+    var <caret>foo: String
+}
+
+class B: A {
+    override val foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+
+        }
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt.after

@@ -0,0 +1,5 @@
+trait A {
+}
+
+class B: A {
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt

@@ -0,0 +1,14 @@
+trait A {
+    val <caret>foo: String
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A, Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt.after

@@ -0,0 +1,13 @@
+trait A {
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A, Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt

@@ -0,0 +1,17 @@
+trait A {
+    var <caret>foo: String
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A, Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+
+        }
+}

idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt.after

@@ -0,0 +1,16 @@
+trait A {
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A, Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+
+        }
+}

idea/testData/safeDelete/deleteProperty/noUsages.kt

@@ -0,0 +1,9 @@
+class C {
+    val <caret>foo: String
+        get() {
+            return "foo"
+        }
+}
+
+class B {
+}

idea/testData/safeDelete/deleteProperty/noUsages.kt.after

@@ -0,0 +1,5 @@
+class C {
+}
+
+class B {
+}

idea/testData/safeDelete/deleteProperty/override1.kt

@@ -0,0 +1,13 @@
+open class A {
+    open val foo: String
+        get() {
+            return "A"
+        }
+}
+
+class B: A() {
+    override val <caret>foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/override1.kt.after

@@ -0,0 +1,9 @@
+open class A {
+    open val foo: String
+        get() {
+            return "A"
+        }
+}
+
+class B: A() {
+}

idea/testData/safeDelete/deleteProperty/override2.kt

@@ -0,0 +1,13 @@
+open class A {
+    open val <caret>foo: String
+        get() {
+            return "A"
+        }
+}
+
+class B: A() {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/override2.kt.after

@@ -0,0 +1,5 @@
+open class A {
+}
+
+class B: A() {
+}

idea/testData/safeDelete/deleteProperty/override3.kt

@@ -0,0 +1,19 @@
+open class A {
+    open var foo: String
+        get() {
+            return "A"
+        }
+        set(value: String) {
+            println()
+        }
+}
+
+class B: A() {
+    override var <caret>foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/override3.kt.after

@@ -0,0 +1,12 @@
+open class A {
+    open var foo: String
+        get() {
+            return "A"
+        }
+        set(value: String) {
+            println()
+        }
+}
+
+class B: A() {
+}

idea/testData/safeDelete/deleteProperty/override4.kt

@@ -0,0 +1,19 @@
+open class A {
+    open var <caret>foo: String
+        get() {
+            return "A"
+        }
+        set(value: String) {
+            println()
+        }
+}
+
+class B: A() {
+    override var foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/override4.kt.after

@@ -0,0 +1,5 @@
+open class A {
+}
+
+class B: A() {
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt

@@ -0,0 +1,17 @@
+open class A {
+    open val foo: String
+        get() {
+            return "A"
+        }
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A(), Z {
+    override val <caret>foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt.messages

@@ -0,0 +1 @@
+val foo: jet.String in final class B : A, Z implements val foo: jet.String in trait Z.

idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt

@@ -0,0 +1,17 @@
+open class A {
+    open val <caret>foo: String
+        get() {
+            return "A"
+        }
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A(), Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt.after

@@ -0,0 +1,13 @@
+open class A {
+}
+
+trait Z {
+    val foo: String
+}
+
+class B: A(), Z {
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt

@@ -0,0 +1,23 @@
+open class A {
+    open var foo: String
+        get() {
+            return "A"
+        }
+        set(value: String) {
+            println()
+        }
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A(), Z {
+    override var <caret>foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt.messages

@@ -0,0 +1 @@
+var foo: jet.String in final class B : A, Z implements var foo: jet.String in trait Z.

idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt

@@ -0,0 +1,23 @@
+open class A {
+    open var <caret>foo: String
+        get() {
+            return "A"
+        }
+        set(value: String) {
+            println()
+        }
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A(), Z {
+    override var foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt.after

@@ -0,0 +1,16 @@
+open class A {
+}
+
+trait Z {
+    var foo: String
+}
+
+class B: A(), Z {
+    override var foo: String
+        get() {
+            return "B"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt

@@ -0,0 +1,17 @@
+open class A {
+    val <caret>foo: String
+        get() {
+            return "A"
+        }
+}
+
+class B: A {
+    fun bar() {
+        println(foo)
+    }
+
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt.after

@@ -0,0 +1,13 @@
+open class A {
+}
+
+class B: A {
+    fun bar() {
+        println(foo)
+    }
+
+    override val foo: String
+        get() {
+            return "B"
+        }
+}

idea/testData/safeDelete/deleteProperty/property1.kt

@@ -0,0 +1,9 @@
+package test
+
+import test.foo
+
+val <caret>foo = "foo"
+
+class B {
+
+}

idea/testData/safeDelete/deleteProperty/property1.kt.after

@@ -0,0 +1,5 @@
+package test
+
+class B {
+
+}

idea/testData/safeDelete/deleteProperty/property2.kt

@@ -0,0 +1,9 @@
+package test
+
+import test.foo
+
+val <caret>foo = "foo"
+
+class B {
+    val ref = foo
+}

idea/testData/safeDelete/deleteProperty/property2.kt.messages

@@ -0,0 +1,2 @@
+Property foo has 1 usage that is not safe to delete.
+Of those 0 usages are in strings, comments, or non-code files.

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java

@@ -0,0 +1,6 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java.after

@@ -0,0 +1,6 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt

@@ -0,0 +1,7 @@
+trait A {
+    val <caret>foo: String
+}
+
+trait Z {
+    val foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt.after

@@ -0,0 +1,6 @@
+trait A {
+}
+
+trait Z {
+    val foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java

@@ -0,0 +1,6 @@
+class B implements A {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java.after

@@ -0,0 +1,2 @@
+class B implements A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt

@@ -0,0 +1,3 @@
+trait A {
+    val <caret>foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt.after

@@ -0,0 +1,2 @@
+trait A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java

@@ -0,0 +1,11 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void getFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java.after

@@ -0,0 +1,11 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void getFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt

@@ -0,0 +1,7 @@
+trait A {
+    var <caret>foo: String
+}
+
+trait Z {
+    var foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt.after

@@ -0,0 +1,6 @@
+trait A {
+}
+
+trait Z {
+    var foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java

@@ -0,0 +1,11 @@
+class B implements A {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java.after

@@ -0,0 +1,3 @@
+class B implements A {
+
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt

@@ -0,0 +1,3 @@
+trait A {
+    var <caret>foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt.after

@@ -0,0 +1,2 @@
+trait A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java

@@ -0,0 +1,10 @@
+class B extends A {
+    void bar() {
+        System.out.println(getFoo());
+    }
+
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java.after

@@ -0,0 +1,9 @@
+class B extends A {
+    void bar() {
+        System.out.println(getFoo());
+    }
+
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt

@@ -0,0 +1,3 @@
+open class A {
+    open val <caret>foo: String = ""
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java

@@ -0,0 +1,6 @@
+class B extends A {
+    @Override
+    String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java.after

@@ -0,0 +1,2 @@
+class B extends A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt

@@ -0,0 +1,3 @@
+open class A {
+    open val <caret>foo: String = ""
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java

@@ -0,0 +1,16 @@
+class B extends A {
+    void bar() {
+        setFoo("");
+        System.out.println(getFoo());
+    }
+
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java.after

@@ -0,0 +1,14 @@
+class B extends A {
+    void bar() {
+        setFoo("");
+        System.out.println(getFoo());
+    }
+
+    public String getFoo() {
+        return "foo";
+    }
+
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt

@@ -0,0 +1,3 @@
+open class A {
+    open var <caret>foo: String = ""
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java

@@ -0,0 +1,11 @@
+class B extends A {
+    @Override
+    String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java.after

@@ -0,0 +1,3 @@
+class B extends A {
+
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt

@@ -0,0 +1,3 @@
+open class A {
+    open var <caret>foo: String = ""
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java

@@ -0,0 +1,6 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java.after

@@ -0,0 +1,6 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt

@@ -0,0 +1,7 @@
+open class A {
+    public open val <caret>foo: String = ""
+}
+
+trait Z {
+    public val foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt.after

@@ -0,0 +1,6 @@
+open class A {
+}
+
+trait Z {
+    public val foo: String
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java

@@ -0,0 +1,11 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java.after

@@ -0,0 +1,11 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.kt

@@ -0,0 +1,7 @@
+open class A {
+    public open var <caret>foo: String = ""
+}
+
+trait Z {
+    public var foo: String
+}