inline parameter: check inner/local classes (IDEA-40703)

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

@@ -218,8 +218,16 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor
             else {
               final PsiClass methodContainingClass = myMethod.getContainingClass();
               LOG.assertTrue(methodContainingClass != null);
-              if (!(refClass.getParent() instanceof PsiFile) && !PsiTreeUtil.isAncestor(methodContainingClass, refClass, false)) {
-                conflicts.putValue(expression, classUnavailableMessage);
+              if (!PsiTreeUtil.isAncestor(myMethod, refClass, false)) {
+                PsiElement parent = refClass;
+                while ((parent = parent.getParent()) instanceof PsiClass) {
+                  if (!PsiUtil.isAccessible((PsiClass)parent, myMethod, null)) {
+                    break;
+                  }
+                }
+                if (!(parent instanceof PsiFile)) {
+                  conflicts.putValue(expression, classUnavailableMessage);
+                }
               }
             }
           }

java/java-tests/testData/refactoring/inlineParameter/RefNewInner.java

@@ -12,6 +12,6 @@ class User {
     subj.withClass(new Local());
   }
 
-  class Local {
+  private class Local {
   }
 }

java/java-tests/testData/refactoring/inlineParameter/RefNewInnerAvailable.java

@@ -0,0 +1,17 @@
+public class Subject {
+  private int myInt;
+
+  public void withClass(Object <caret>o) {
+    myInt += o.hashCode();
+  }
+}
+
+class User {
+  private void oper() throws IOException {
+    Subject subj = new Subject();
+    subj.withClass(new Local());
+  }
+
+  class Local {
+  }
+}

java/java-tests/testData/refactoring/inlineParameter/RefNewInnerAvailable.java.after

@@ -0,0 +1,17 @@
+public class Subject {
+  private int myInt;
+
+  public void withClass() {
+    myInt += new User.Local().hashCode();
+  }
+}
+
+class User {
+  private void oper() throws IOException {
+    Subject subj = new Subject();
+    subj.withClass();
+  }
+
+  class Local {
+  }
+}

java/java-tests/testData/refactoring/inlineParameter/RefNewInnerFromMethod.java

@@ -0,0 +1,16 @@
+public class Subject {
+    private int myInt;
+
+    public void withClass(Object <caret>o) {
+        myInt += o.hashCode();
+    }
+
+    private void oper() throws IOException {
+      Subject subj = new Subject();
+      class Local {
+      }
+      subj.withClass(new Local());
+    }
+
+
+}

java/java-tests/testData/refactoring/inlineParameter/RefNewInnerInHierarchyAvailable.java

@@ -0,0 +1,18 @@
+public class Subject {
+  private int myInt;
+
+  public void withClass(Object <caret>o) {
+    myInt += o.hashCode();
+  }
+}
+
+class User {
+  private void oper() throws IOException {
+    Subject subj = new Subject();
+    subj.withClass(new Local().new InnerLocal());
+  }
+
+  class Local {
+    class InnerLocal {}
+  }
+}

java/java-tests/testData/refactoring/inlineParameter/RefNewInnerInHierarchyAvailable.java.after

@@ -0,0 +1,18 @@
+public class Subject {
+  private int myInt;
+
+  public void withClass() {
+    myInt += new User.Local().new InnerLocal().hashCode();
+  }
+}
+
+class User {
+  private void oper() throws IOException {
+    Subject subj = new Subject();
+    subj.withClass();
+  }
+
+  class Local {
+    class InnerLocal {}
+  }
+}

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

@@ -126,6 +126,23 @@ public class InlineParameterTest extends LightCodeInsightTestCase {
     doTest(false);
   }
 
+  public void testRefNewInnerAvailable() throws Exception {
+    doTest(false);
+  }
+
+  public void testRefNewInnerFromMethod() throws Exception {
+    try {
+      doTest(false);
+    }
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
+      assertEquals("Parameter initializer depends on class <b><code>Local</code></b> which is not available inside method and cannot be inlined", e.getMessage());
+    }
+  }
+
+  public void testRefNewInnerInHierarchyAvailable() throws Exception {
+    doTest(false);
+  }
+
   public void testRefNewTopLevel() throws Exception {
     doTest(false);
   }