Implement "Safe Delete" refactoring for type parameters

Conflicts:
	idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java

Conflicts:
	generators/org/jetbrains/jet/generators/tests/GenerateTests.java

Conflicts:
	generators/org/jetbrains/jet/generators/tests/GenerateTests.java

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt

@@ -0,0 +1,7 @@
+class A<<caret>X, Y, Z> {
+    fun foo(x: X) {
+
+    }
+}
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<<caret>Y>(x: X, y: Y) {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int>("123", 123)
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt

@@ -0,0 +1,7 @@
+class A<<caret>X, Y: X, Z> {
+    fun foo(x: X) {
+
+    }
+}
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages

@@ -0,0 +1,2 @@
+Type parameter X has 2 usages that are not safe to delete.
+Of those 0 usages are in strings, comments, or non-code files.

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt

@@ -0,0 +1,4 @@
+class A<<caret>X, Y, Z> where Y: X {
+}
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt

@@ -0,0 +1,9 @@
+class A<<caret>X> {
+    fun foo<Y, Z>() where Y: X {
+
+    }
+}
+
+fun bar(a: A<Number>) {
+    a.foo<Int, String>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt

@@ -0,0 +1,3 @@
+class A<out <caret>X: Comparable<X>, in Y: Number, Z>
+
+val a = A<String, Int, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt.after

@@ -0,0 +1,3 @@
+class A<in Y: Number, Z>
+
+val a = A<Int, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt

@@ -0,0 +1,3 @@
+class A<out X: Comparable<X>, in <caret>Y: Number, Z>
+
+val a = A<String, Int, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt.after

@@ -0,0 +1,3 @@
+class A<out X: Comparable<X>, Z>
+
+val a = A<String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt

@@ -0,0 +1,3 @@
+open class A<<caret>X, Y, Z>
+
+class B<T, U>: A<T, String, U>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt.after

@@ -0,0 +1,3 @@
+open class A<Y, Z>
+
+class B<T, U>: A<String, U>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt

@@ -0,0 +1,3 @@
+open class A<<caret>X, Y, Z>
+
+class B<T, U>: A<String, T, U>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt.after

@@ -0,0 +1,3 @@
+open class A<Y, Z>
+
+class B<T, U>: A<T, U>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt

@@ -0,0 +1,3 @@
+class A<<caret>X, Y, Z>
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt.after

@@ -0,0 +1,3 @@
+class A<Y, Z>
+
+val a = A<String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt

@@ -0,0 +1,3 @@
+class A<X, <caret>Y, Z>
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt.after

@@ -0,0 +1,3 @@
+class A<X, Z>
+
+val a = A<Int, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt

@@ -0,0 +1,3 @@
+class A<X, Y, <caret>Z>
+
+val a = A<Int, String, Any>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt.after

@@ -0,0 +1,3 @@
+class A<X, Y>
+
+val a = A<Int, String>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<<caret>Y, Z>() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int, Any>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<Z>() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Any>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<Y, <caret>Z>() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int, Any>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<Y>() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt

@@ -0,0 +1,3 @@
+class A<<caret>X>
+
+val a = A<Int>()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt.after

@@ -0,0 +1,3 @@
+class A
+
+val a = A()

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo<<caret>Y>() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt.after

@@ -0,0 +1,9 @@
+class A<X> {
+    fun foo() {
+
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt

@@ -0,0 +1,5 @@
+class A<<caret>X, Y, Z> {
+    fun foo(x: X) {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.java

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Int>foo("123", 123)
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<<caret>Y>(x: X, y: Y) {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt

@@ -0,0 +1,5 @@
+class A<<caret>X, Y: X, Z> {
+    fun foo(x: X) {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages

@@ -0,0 +1,2 @@
+Type parameter X has 2 usages that are not safe to delete.
+Of those 0 usages are in strings, comments, or non-code files.

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt

@@ -0,0 +1,2 @@
+class A<<caret>X, Y, Z> where Y: X {
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.java

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<Number> a) {
+        a.<Int, String>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt

@@ -0,0 +1,5 @@
+class A<<caret>X> {
+    fun foo<Y, Z>() where Y: X {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages

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

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java

@@ -0,0 +1,3 @@
+class B {
+    A a = new A()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java.after

@@ -0,0 +1,3 @@
+class B {
+    A a = new A()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt

@@ -0,0 +1 @@
+class A<<caret>X, Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt.after

@@ -0,0 +1 @@
+class A<Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java

@@ -0,0 +1,3 @@
+class B {
+    A<String, Int, Object> a = new A<String, Int, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java.after

@@ -0,0 +1,3 @@
+class B {
+    A<Int, Object> a = new A<Int, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt

@@ -0,0 +1 @@
+class A<out <caret>X: Comparable<X>, in Y: Number, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt.after

@@ -0,0 +1 @@
+class A<in Y: Number, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java

@@ -0,0 +1,3 @@
+class B {
+    A<String, Int, Object> a = new A<String, Int, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java.after

@@ -0,0 +1,3 @@
+class B {
+    A<String, Object> a = new A<String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt

@@ -0,0 +1 @@
+class A<out X: Comparable<X>, in <caret>Y: Number, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt.after

@@ -0,0 +1 @@
+class A<out X: Comparable<X>, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java

@@ -0,0 +1,3 @@
+class B<T, U> extends A<T, String, U> {
+
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java.after

@@ -0,0 +1,3 @@
+class B<T, U> extends A<String, U> {
+
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt

@@ -0,0 +1 @@
+open class A<<caret>X, Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt.after

@@ -0,0 +1 @@
+open class A<Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java

@@ -0,0 +1,3 @@
+class B<T, U> extends A<String, T, U> {
+
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java.after

@@ -0,0 +1,3 @@
+class B<T, U> extends A<T, U> {
+
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt

@@ -0,0 +1 @@
+open class A<<caret>X, Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt.after

@@ -0,0 +1 @@
+open class A<Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java.after

@@ -0,0 +1,3 @@
+class B {
+    A<String, Object> a = new A<String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt

@@ -0,0 +1 @@
+class A<<caret>X, Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt.after

@@ -0,0 +1 @@
+class A<Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java.after

@@ -0,0 +1,3 @@
+class B {
+    A<Int, Object> a = new A<Int, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt

@@ -0,0 +1 @@
+class A<X, <caret>Y, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt.after

@@ -0,0 +1 @@
+class A<X, Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String, Object> a = new A<Int, String, Object>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java.after

@@ -0,0 +1,3 @@
+class B {
+    A<Int, String> a = new A<Int, String>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt

@@ -0,0 +1 @@
+class A<X, Y, <caret>Z>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt.after

@@ -0,0 +1 @@
+class A<X, Y>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Int, Object>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java.after

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Object>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<<caret>Y, Z>() {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<Z>() {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Int, Object>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java.after

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Int>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<Y, <caret>Z>() {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<Y>() {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java

@@ -0,0 +1,3 @@
+class B {
+    A<Int> a = new A<Int>()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java.after

@@ -0,0 +1,3 @@
+class B {
+    A a = new A()
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt

@@ -0,0 +1 @@
+class A<<caret>X>

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt.after

@@ -0,0 +1 @@
+class A

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.<Int>foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java.after

@@ -0,0 +1,5 @@
+class B {
+    void bar(A<String> a) {
+        a.foo()
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo<<caret>Y>() {
+
+    }
+}

idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt.after

@@ -0,0 +1,5 @@
+class A<X> {
+    fun foo() {
+
+    }
+}