IDEA-122014 Extract method duplicates analysis fails in case of inner classes

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

@@ -354,6 +354,17 @@ public class DuplicatesFinder {
         return false;
       }
 
+      if (qualifier1 == null && qualifier2 == null) {
+        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;
+        }
+      }
+
     }
 
     if (pattern instanceof PsiTypeCastExpression) {

java/java-tests/testData/refactoring/methodDuplicates/SkipNonRelatedCalls.java

@@ -0,0 +1,16 @@
+class CommonParent {
+  void foo() {}
+}
+
+public class A extends CommonParent {
+
+  private void <caret>f() {
+    foo();
+  }
+
+  private class B extends CommonParent {
+    void g() {
+      foo();
+    }
+  }
+}

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

@@ -51,6 +51,10 @@ public class FindMethodDuplicatesTest extends FindMethodDuplicatesBaseTest{
     doTest();
   }
 
+  public void testSkipNonRelatedCalls() throws Exception {
+    doTest(false);
+  }
+
   public void testMappingAny2ParameterPrimitiveLvalue() throws Exception {
     doTest(false);
   }