diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java index 2d2c2d5892a1..798d8832701c 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java +++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java @@ -435,6 +435,13 @@ public class DuplicatesFinder { final PsiElement candidateContextClass = candidateQualifier == null ? PsiTreeUtil.getParentOfType(candidate, PsiClass.class) : candidateQualifier.resolve(); return contextClass == candidateContextClass; } + } else if (pattern instanceof PsiSuperExpression) { + final PsiJavaCodeReferenceElement qualifier = ((PsiSuperExpression)pattern).getQualifier(); + final PsiElement contextClass = qualifier == null ? PsiTreeUtil.getParentOfType(pattern, PsiClass.class) : qualifier.resolve(); + if (candidate instanceof PsiSuperExpression) { + final PsiJavaCodeReferenceElement candidateQualifier = ((PsiSuperExpression)candidate).getQualifier(); + return contextClass == (candidateQualifier != null ? candidateQualifier.resolve() : PsiTreeUtil.getParentOfType(candidate, PsiClass.class)); + } } PsiElement[] children1 = getFilteredChildren(pattern); diff --git a/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContext.java b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContext.java new file mode 100644 index 000000000000..a1d887e47378 --- /dev/null +++ b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContext.java @@ -0,0 +1,17 @@ +public class a { + public void login() { + System.out.println(); + } +} + +class b extends a { + public void doLogin() throws Exception { + super.login(); + } +} + +class c extends a { + public void doLogin() throws Exception { + super.login(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java new file mode 100644 index 000000000000..cfa8195a874d --- /dev/null +++ b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java @@ -0,0 +1,20 @@ +public class a { + public void login() { + System.out.println(); + } +} + +class b extends a { + public void doLogin() throws Exception { + super.login(); + } + + public void foo() throws Exception { + new Runnable() { + public void run() { + b.super.login(); + } + }.run(); + } +} + diff --git a/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java.after b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java.after new file mode 100644 index 000000000000..8fdb60b8d25c --- /dev/null +++ b/java/java-tests/testData/refactoring/methodDuplicatesMisc/SuperInTheSameContextQualified.java.after @@ -0,0 +1,20 @@ +public class a { + public void login() { + System.out.println(); + } +} + +class b extends a { + public void doLogin() throws Exception { + super.login(); + } + + public void foo() throws Exception { + new Runnable() { + public void run() { + doLogin(); + } + }.run(); + } +} + diff --git a/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesMiscTest.java b/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesMiscTest.java index cc6e5789936c..de1cf687c778 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesMiscTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesMiscTest.java @@ -53,4 +53,12 @@ public class FindMethodDuplicatesMiscTest extends FindMethodDuplicatesBaseTest { public void testCorrectThis() throws Exception { doTest(); } + + public void testSuperInTheSameContext() throws Exception { + doTest(false); + } + + public void testSuperInTheSameContextQualified() throws Exception { + doTest(); + } } \ No newline at end of file