resolve conflict on type param rename (IDEA-57326)

java/java-tests/testData/refactoring/renameCollisions/RenameTypeParamToSuper.java

@@ -0,0 +1,12 @@
+abstract class A{
+    class T{}
+    abstract T foo();
+}
+class B<<caret>S> extends A{
+    void foo(T x){}
+
+    @Override
+    T foo() {
+        return null;
+    }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameTypeParamToSuper.java.after

@@ -0,0 +1,12 @@
+abstract class A{
+    class T{}
+    abstract T foo();
+}
+class B<T> extends A{
+    void foo(A.T x){}
+
+    @Override
+    A.T foo() {
+        return null;
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java

@@ -217,6 +217,10 @@ public class RenameCollisionsTest extends LightRefactoringTestCase {
     doTest("gg");
   }
 
+  public void testRenameTypeParamToSuper() throws Exception {
+    doTest("T");
+  }
+
   private void doTest(final String newName) throws Exception {
     configureByFile(BASE_PATH + getTestName(false) + ".java");
     PsiElement element = TargetElementUtilBase