inline method: do not check for inaccessibility if referenced member would be also inlined (IDEA-78941 )

java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java

@@ -195,7 +195,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
                                                     final ReferencedElementsCollector collector,
                                                     final MultiMap<PsiElement, String> conflicts) {
     element.accept(collector);
-    final Map<PsiMember, Set<PsiMember>> containersToReferenced = getInaccessible(collector.myReferencedMembers, usages);
+    final Map<PsiMember, Set<PsiMember>> containersToReferenced = getInaccessible(collector.myReferencedMembers, usages, element);
 
     final Set<PsiMember> containers = containersToReferenced.keySet();
     for (PsiMember container : containers) {
@@ -216,12 +216,17 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
    *
    * @param referencedElements
    * @param usages
+   * @param elementToInline
    */
-  private static Map<PsiMember, Set<PsiMember>> getInaccessible(HashSet<PsiMember> referencedElements, UsageInfo[] usages) {
+  private static Map<PsiMember, Set<PsiMember>> getInaccessible(HashSet<PsiMember> referencedElements,
+                                                                UsageInfo[] usages,
+                                                                PsiElement elementToInline) {
     Map<PsiMember, Set<PsiMember>> result = new HashMap<PsiMember, Set<PsiMember>>();
 
     for (UsageInfo usage : usages) {
-      final PsiElement container = ConflictsUtil.getContainer(usage.getElement());
+      final PsiElement usageElement = usage.getElement();
+      if (usageElement == null) continue;
+      final PsiElement container = ConflictsUtil.getContainer(usageElement);
       if (!(container instanceof PsiMember)) continue;    // usage in import statement
       PsiMember memberContainer = (PsiMember)container;
       Set<PsiMember> inaccessibleReferenced = result.get(memberContainer);
@@ -229,7 +234,8 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
         inaccessibleReferenced = new HashSet<PsiMember>();
         result.put(memberContainer, inaccessibleReferenced);
         for (PsiMember member : referencedElements) {
-          if (!PsiUtil.isAccessible(member, usage.getElement(), null)) {
+          if (PsiTreeUtil.isAncestor(elementToInline, member, false)) continue;
+          if (!PsiUtil.isAccessible(member, usageElement, null)) {
             inaccessibleReferenced.add(member);
           }
         }

java/java-tests/testData/refactoring/inlineMethod/InlineAnonymousClassWithPrivateMethodInside.java

@@ -0,0 +1,24 @@
+public class Foo {
+  public static void f<caret>oo() {
+    bar(new Runnable() {
+      @Override
+      public void run() {
+        doRun();
+      }
+
+      private void doRun() {
+        // Woo-hoo
+      }
+    });
+  }
+
+  public static void bar(final Runnable runnable) {
+    runnable.run();
+  }
+}
+
+class Bar {
+  public static void main(String[] args) {
+    Foo.foo();
+  }
+}

java/java-tests/testData/refactoring/inlineMethod/InlineAnonymousClassWithPrivateMethodInside.java.after

@@ -0,0 +1,21 @@
+public class Foo {
+
+    public static void bar(final Runnable runnable) {
+    runnable.run();
+  }
+}
+
+class Bar {
+  public static void main(String[] args) {
+      Foo.bar(new Runnable() {
+          @Override
+          public void run() {
+              doRun();
+          }
+
+          private void doRun() {
+              // Woo-hoo
+          }
+      });
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java

@@ -170,6 +170,10 @@ public class InlineMethodTest extends LightRefactoringTestCase {
   public void testSuperMethodInAnonymousClass() throws Exception {
     doTest();
   }
+  
+  public void testInlineAnonymousClassWithPrivateMethodInside() throws Exception {
+    doTest();
+  }
 
   private void doTest() throws Exception {
     String name = getTestName(false);