generate method: insert Override when super method is accessible (IDEA-189949)

java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java

@@ -719,7 +719,7 @@ public class GenerateMembersUtil {
 
     if (JavaCodeStyleSettings.getInstance(targetClass.getContainingFile()).INSERT_OVERRIDE_ANNOTATION) {
       PsiMethod superMethod = targetClass.findMethodBySignature(generated, true);
-      if (superMethod != null && superMethod.getContainingClass() != targetClass) {
+      if (superMethod != null && superMethod.getContainingClass() != targetClass && PsiUtil.isAccessible(superMethod, targetClass, null)) {
         OverrideImplementUtil.annotateOnOverrideImplement(generated, targetClass, superMethod, true);
       }
     }

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/a/Test.java

@@ -0,0 +1,5 @@
+package a;
+
+public class A {
+  int getFoo();
+}

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/b/B.java

@@ -0,0 +1,13 @@
+package b;
+import a.A;
+class B extends A {
+  int foo;
+
+    public int getFoo() {
+        return foo;
+    }
+
+    public void setFoo(int foo) {
+        this.foo = foo;
+    }
+}

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/a/Test.java

@@ -0,0 +1,5 @@
+package a;
+
+public class A {
+  int getFoo();
+}

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/b/B.java

@@ -0,0 +1,5 @@
+package b;
+import a.A;
+class B extends A {
+  int foo;
+}

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

@@ -61,6 +61,10 @@ public class EncapsulateFieldsTest extends MultiFileTestCase {
     doTest("i", "B.A", null);
   }
 
+  public void testInaccessibleSuperMethod() {
+    doTest("foo", "b.B", null);
+  }
+
   public void testHideOuterclassMethod() {
     doTest("i", "A.B", "There is already a method <b><code>A.getI()</code></b> which would be hidden by generated getter");
   }