MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

extract method: enable duplicates inside inner classes called methods from outer (IDEA-143504)

Browse Source
This commit is contained in:
Anna Kozlova
2015-08-11 06:00:37 -07:00
parent 1bda9a4e62
commit c7dfe22f31
4 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
View File

@@ -376,10 +376,13 @@ public class DuplicatesFinder {
final PsiClass patternClass = RefactoringChangeUtil.getThisClass(pattern);
final PsiClass candidateClass = RefactoringChangeUtil.getThisClass(candidate);
if (resolveResult1 == resolveResult2 &&
resolveResult1 instanceof PsiMember &&
!InheritanceUtil.isInheritorOrSelf(candidateClass, patternClass, true) &&
InheritanceUtil.isInheritorOrSelf(candidateClass, ((PsiMember)resolveResult1).getContainingClass(), true)) {
return false;
resolveResult1 instanceof PsiMember) {
final PsiClass containingClass = ((PsiMember)resolveResult1).getContainingClass();
if (!InheritanceUtil.isInheritorOrSelf(candidateClass, patternClass, true) &&
InheritanceUtil.isInheritorOrSelf(candidateClass, containingClass, true) &&
InheritanceUtil.isInheritorOrSelf(patternClass, containingClass, true)) {
return false;
}
}
}

16
java/java-tests/testData/refactoring/extractMethod/DuplicatesFromAnonymous.java Normal file
View File

@@ -0,0 +1,16 @@
import java.util.*;
class Main {
private final Map<Integer, Map<String, String>> myScheduledUpdates = null;
void foo() {
new Runnable() {
@Override
public void run() {
<selection>myScheduledUpdates.keySet().toArray(new Object[myScheduledUpdates.keySet().size()])</selection>;
}
};
myScheduledUpdates.keySet().toArray(new Object[myScheduledUpdates.keySet().size()]);
}
}

20
java/java-tests/testData/refactoring/extractMethod/DuplicatesFromAnonymous_after.java Normal file
View File

@@ -0,0 +1,20 @@
import java.util.*;
class Main {
private final Map<Integer, Map<String, String>> myScheduledUpdates = null;
void foo() {
new Runnable() {
@Override
public void run() {
newMethod();
}
};
newMethod();
}
private Object[] newMethod() {
return myScheduledUpdates.keySet().toArray(new Object[myScheduledUpdates.keySet().size()]);
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
View File

@@ -225,6 +225,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
doDuplicatesTest();
}
public void testDuplicatesFromAnonymous() throws Exception {
doDuplicatesTest();
}
public void testCodeDuplicatesWithContinueNoReturn() throws Exception {
doDuplicatesTest();
}