From 38307a37c935e03d688c434352745f4fdaa4b5d5 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 17 Jul 2019 10:39:39 +0700
Subject: [PATCH] JavaPushDownDelegate#inlineSuperCall: prevent NPE when super
 method has no body (EA-208780)

GitOrigin-RevId: 6387fb8b498fb3a57e0dba0dd1540d1b25239623
---
 .../refactoring/memberPushDown/JavaPushDownDelegate.java   | 7 +++++--
 .../superMethodWithoutBody/after/Test.java                 | 6 ++++++
 .../superMethodWithoutBody/before/Super.java               | 4 ++++
 .../superMethodWithoutBody/before/Test.java                | 6 ++++++
 .../intellij/java/refactoring/InlineSuperClassTest.java    | 1 +
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/after/Test.java
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Super.java
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Test.java

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
index f87d01bd600d..2de16258568c 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
@@ -360,8 +360,11 @@ public class JavaPushDownDelegate extends PushDownDelegate<MemberInfo, PsiMember
       PsiElement element = reference.getElement();
       if (element instanceof PsiReferenceExpression) {
         PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element;
-        new InlineMethodProcessor(element.getProject(), superMethod, referenceExpression, null, true)
-          .inlineMethodCall(referenceExpression);
+        if (superMethod.getBody() != null) {
+          // No super method body: either native method or compilation error
+          new InlineMethodProcessor(element.getProject(), superMethod, referenceExpression, null, true)
+            .inlineMethodCall(referenceExpression);
+        }
       }
     }
   }
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/after/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/after/Test.java
new file mode 100644
index 000000000000..944f42732f7c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/after/Test.java
@@ -0,0 +1,6 @@
+
+class Test {
+  void foo() {
+    super.foo();
+  }
+}
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Super.java b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Super.java
new file mode 100644
index 000000000000..b1f37c78d4e5
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Super.java
@@ -0,0 +1,4 @@
+
+class Super {
+  native void foo();
+}
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Test.java
new file mode 100644
index 000000000000..14eeaecedcec
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/superMethodWithoutBody/before/Test.java
@@ -0,0 +1,6 @@
+
+class Test extends Super {
+  void foo() {
+    super.foo();
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
index cd48c19ff517..ac1628d61640 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
@@ -76,6 +76,7 @@ public class InlineSuperClassTest extends LightMultiFileTestCase {
   }
   public void testThisQualificationInsideAnonymous() { doTest(); }
   public void testOrderOfInnerClasses() { doTest(); }
+  public void testSuperMethodWithoutBody() { doTest(); }
 
   private void doTest() {
     doTest(false, false);