KT-6795 J2K: When converting to type with projections, omit redundant use-site projections

 #KT-6795 Fixed

Author: valentinkip

idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt

@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments
 import org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention
+import org.jetbrains.kotlin.idea.quickfix.RemoveModifierFix
 import org.jetbrains.kotlin.idea.quickfix.RemoveRightPartOfBinaryExpressionFix
 import org.jetbrains.kotlin.j2k.PostProcessor
 import org.jetbrains.kotlin.psi.*
@@ -54,6 +55,11 @@ public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : Pos
                 }
             }
 
+            Errors.REDUNDANT_PROJECTION -> { ->
+                val fix = RemoveModifierFix.createRemoveProjectionFactory(true).createActions(problem).single() as RemoveModifierFix
+                fix.invoke()
+            }
+
             else -> super.fixForProblem(problem)
         }
     }

idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.java

@@ -94,6 +94,10 @@ public String getText() {
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException {
+        invoke();
+    }
+
+    public void invoke() throws IncorrectOperationException {
         JetModifierListOwner newElement = (JetModifierListOwner) element.copy();
         element.replace(removeModifier(newElement, modifier));
     }

j2k/testData/fileOrElement/mutableCollections/Overrides.kt

@@ -4,7 +4,7 @@ import kotlinApi.KotlinClass
 
 public abstract class C(field: Int) : KotlinClass(field) {
 
-    override fun foo(mutableCollection: MutableCollection<String>, nullableCollection: Collection<out Int>?): MutableList<Any> {
+    override fun foo(mutableCollection: MutableCollection<String>, nullableCollection: Collection<Int>?): MutableList<Any> {
         return super.foo(mutableCollection, nullableCollection)
     }
 }

j2k/testData/fileOrElement/outProjectionType/methodParams.kt

@@ -1,2 +1,2 @@
-fun pushAll(src: Collection<out E>) {
+fun pushAll(src: Collection<E>) {
 }

j2k/testData/fileOrElement/typeCastExpression/extendsWildcardCast.kt

@@ -1 +1 @@
-list as List<out String>
+list as List<String>

j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1 @@
-class CC<T : INode, K : Node> : A() where T : Comparable<in T>, K : Collection<in K>
+class CC<T : INode, K : Node> : A() where T : Comparable<T>, K : Collection<in K>

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt

@@ -1 +1 @@
-class C<T : INode> where T : Comparable<in T>
+class C<T : INode> where T : Comparable<T>

j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1 @@
-class C<T : INode> : A() where T : Comparable<in T>
+class C<T : INode> : A() where T : Comparable<T>

j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt

@@ -1,2 +1,2 @@
-fun <T : Any, K : Node> max(coll: Collection<out T>): T where T : Comparable<in T>, K : Collection<in K> {
+fun <T : Any, K : Node> max(coll: Collection<T>): T where T : Comparable<T>, K : Collection<in K> {
 }

j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1 @@
-trait I<T : INode, K : Node> : II where T : Comparable<in T>, K : Collection<in K>
+trait I<T : INode, K : Node> : II where T : Comparable<T>, K : Collection<in K>

j2k/testData/fileOrElement/typeParameters/where.kt

@@ -1,2 +1,2 @@
-fun <T : Any> max(coll: Collection<out T>): T where T : Comparable<in T> {
+fun <T : Any> max(coll: Collection<T>): T where T : Comparable<T> {
 }