MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

safe delete: do not insert additional extends item if already present (IDEA-106144)

Browse Source
This commit is contained in:
anna
2013-04-24 20:52:41 +02:00
parent 2925825f9c
commit b7eff52b83
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java
+6 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.refactoring.safeDelete.usageInfo;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.*;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.IncorrectOperationException;
/**
@@ -50,15 +51,19 @@ public class SafeDeleteExtendsClassUsageInfo extends SafeDeleteReferenceUsageInf
if (extendsList != null) {
final PsiClassType[] referenceTypes = extendsList.getReferencedTypes();
final PsiReferenceList listToAddExtends = refClass.isInterface() == myExtendingClass.isInterface() ? myExtendingClass.getExtendsList() : extendingImplementsList;
final PsiClassType[] existingRefTypes = listToAddExtends.getReferencedTypes();
for (PsiClassType referenceType : referenceTypes) {
if (ArrayUtilRt.find(existingRefTypes, referenceType) > -1) continue;
listToAddExtends.add(elementFactory.createReferenceElementByType((PsiClassType)mySubstitutor.substitute(referenceType)));
}
}
final PsiReferenceList implementsList = refClass.getImplementsList();
if (implementsList != null) {
final PsiClassType[] referenceTypes = implementsList.getReferencedTypes();
final PsiClassType[] existingRefTypes = extendingImplementsList.getReferencedTypes();
PsiClassType[] referenceTypes = implementsList.getReferencedTypes();
for (PsiClassType referenceType : referenceTypes) {
if (ArrayUtilRt.find(existingRefTypes, referenceType) > -1) continue;
extendingImplementsList.add(elementFactory.createReferenceElementByType((PsiClassType)mySubstitutor.substitute(referenceType)));
}
}
java/java-tests/testData/refactoring/safeDelete/UsageInExtendsList.java
+3
View File
@@ -0,0 +1,3 @@
nterface Foo {}
interface Ba<caret>r extends Foo {}
class FooBarImpl implements Foo, Bar {}
java/java-tests/testData/refactoring/safeDelete/UsageInExtendsList_after.java
+3
View File
@@ -0,0 +1,3 @@
nterface Foo {}
class FooBarImpl implements Foo {}
java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
+4
View File
@@ -65,6 +65,10 @@ public class SafeDeleteTest extends MultiFileTestCase {
doTest("IFoo");
}
public void testUsageInExtendsList() throws Exception {
doSingleFileTest();
}
public void testParameterInHierarchy() throws Exception {
myDoCompare = false;
doTest("C2");