inline method: don't ignore super expression conflict if containing class inherits target but the call is located inside static context (IDEA-152173)

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

@@ -302,7 +302,8 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
             final PsiElement element = info.getElement();
             if (element != null) {
               final PsiClass targetContainingClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
-              if (targetContainingClass != null && !InheritanceUtil.isInheritorOrSelf(targetContainingClass, superClass, true)) {
+              if (targetContainingClass != null &&
+                  (!InheritanceUtil.isInheritorOrSelf(targetContainingClass, superClass, true) || PsiUtil.getEnclosingStaticElement(element, targetContainingClass) != null)) {
                 targetContainingClasses.add(targetContainingClass);
               }
             }

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

@@ -0,0 +1,13 @@
+class A {
+  void bar() {}
+}
+
+class B extends A {
+  void foo() {
+    super.bar();
+  }
+
+  static void err(B b) {
+    b.fo<caret>o();
+  }
+}

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

@@ -0,0 +1,13 @@
+class A {
+  void bar() {}
+}
+
+class B extends A {
+  void foo() {
+    super.bar();
+  }
+
+  void err() {
+    fo<caret>o();
+  }
+}

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

@@ -0,0 +1,13 @@
+class A {
+  void bar() {}
+}
+
+class B extends A {
+  void foo() {
+    super.bar();
+  }
+
+  void err() {
+      super.bar();
+  }
+}

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

@@ -304,6 +304,14 @@ public class InlineMethodTest extends LightRefactoringTestCase {
     doTestConflict("Inlined method is used in method reference with side effects in qualifier");
   }
 
+  public void testInaccessibleSuperCallWhenQualifiedInline() throws Exception {
+    doTestConflict("Inlined method calls super.bar() which won't be accessed in class <b><code>B</code></b>");
+  }
+
+  public void testSuperCallWhenUnqualifiedInline() throws Exception {
+    doTestInlineThisOnly();
+  }
+
   private void doTestInlineThisOnly() {
     @NonNls String fileName = "/refactoring/inlineMethod/" + getTestName(false) + ".java";
     configureByFile(fileName);