move inner: avoid suspicious warnings (IDEA-234943)

GitOrigin-RevId: 4d1a7e3d829649e5ab4c6225ece1608db0614d03

java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java

@@ -411,9 +411,14 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
     final String visibilityModifier = VisibilityUtil.getVisibilityModifier(element.getModifierList());
     if (PsiModifier.PRIVATE.equals(visibilityModifier)) return true;
     if (PsiModifier.PUBLIC.equals(visibilityModifier)) return false;
-    if (PsiModifier.PROTECTED.equals(visibilityModifier) &&
-        InheritanceUtil.isInheritorOrSelf(myInnerClass, myOuterClass, true)) {
-      return false;
+    if (PsiModifier.PROTECTED.equals(visibilityModifier)) {
+      if (InheritanceUtil.isInheritorOrSelf(myInnerClass, myOuterClass, true)) {
+        return false;
+      }
+      PsiClass memberClass = element.getContainingClass();
+      if (memberClass != null && InheritanceUtil.hasEnclosingInstanceInScope(memberClass, myInnerClass, true, false)) {
+        return false;
+      }
     }
     final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
     if (myTargetContainer instanceof PsiDirectory) {

java/java-tests/testData/refactoring/moveInner/toOtherPackage/after/package1/AnotherPublic.java

@@ -0,0 +1,12 @@
+package package1;
+
+import package2.InnerClass;
+
+public class AnotherPublic {
+   protected void foo(){}
+}
+
+class OuterClass {
+  private InnerClass instance = new InnerClass();
+
+}

java/java-tests/testData/refactoring/moveInner/toOtherPackage/after/package1/OuterClass.java

@@ -1,8 +0,0 @@
-package package1;
-
-import package2.InnerClass;
-
-public class OuterClass {
-    private InnerClass instance = new InnerClass();
-
-}

java/java-tests/testData/refactoring/moveInner/toOtherPackage/after/package2/InnerClass.java

@@ -1,3 +1,9 @@
 package package2;
 
-public class InnerClass { }
+import package1.AnotherPublic;
+
+public class InnerClass extends AnotherPublic {
+  {
+    foo();
+  }
+}

java/java-tests/testData/refactoring/moveInner/toOtherPackage/before/package1/AnotherPublic.java

@@ -0,0 +1,15 @@
+package package1;
+
+public class AnotherPublic {
+   protected void foo(){}
+}
+
+class OuterClass {
+  private InnerClass instance = new InnerClass();
+
+  private static class InnerClass extends AnotherPublic {
+    {
+      foo();
+    }
+  }
+}

java/java-tests/testData/refactoring/moveInner/toOtherPackage/before/package1/OuterClass.java

@@ -1,7 +0,0 @@
-package package1;
-
-public class OuterClass {
-    private InnerClass instance = new InnerClass();
-
-    private static class InnerClass { }
-}