EA-46646 - IOE: LightElement.add

java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java

@@ -50,7 +50,7 @@ public class SafeDeleteExtendsClassUsageInfo extends SafeDeleteReferenceUsageInf
     final PsiReferenceList extendingImplementsList = myExtendingClass.getImplementsList();
     if (extendsList != null) {
       final PsiClassType[] referenceTypes = extendsList.getReferencedTypes();
-      final PsiReferenceList listToAddExtends = refClass.isInterface() == myExtendingClass.isInterface() ? myExtendingClass.getExtendsList() : extendingImplementsList;
+      final PsiReferenceList listToAddExtends = refClass.isInterface() == myExtendingClass.isInterface() || myExtendingClass instanceof PsiTypeParameter ? myExtendingClass.getExtendsList() : extendingImplementsList;
       final PsiClassType[] existingRefTypes = listToAddExtends.getReferencedTypes();
       for (PsiClassType referenceType : referenceTypes) {
         if (ArrayUtilRt.find(existingRefTypes, referenceType) > -1) continue;

java/java-tests/testData/refactoring/safeDelete/InterfaceAsTypeParameterBound.java

@@ -0,0 +1,3 @@
+interface Foo1 {}
+interface FooTo<caret>Delete extends Foo1 {}
+class TypeParamOwner<B extends FooToDelete> {}

java/java-tests/testData/refactoring/safeDelete/InterfaceAsTypeParameterBound_after.java

@@ -0,0 +1,3 @@
+interface Foo1 {}
+
+class TypeParamOwner<B extends Foo1> {}

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

@@ -127,6 +127,10 @@ public class SafeDeleteTest extends MultiFileTestCase {
     doTest("Super");
   }
 
+  public void testInterfaceAsTypeParameterBound() throws Exception {
+    doSingleFileTest();   
+  }
+
   public void testLocalVariableSideEffect() throws Exception {
     myDoCompare = false;
     try {