From 899e4de21a7f4881485be79db602d0c789166e1e Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Mon, 23 Apr 2018 18:25:13 +0200
Subject: [PATCH] push down: fix extends/implements chooser (IDEA-190409)

---
 .../refactoring/memberPushDown/JavaPushDownDelegate.java     | 3 +--
 .../testData/refactoring/pushDown/InterfaceExtends.java      | 5 +++++
 .../refactoring/pushDown/InterfaceExtends_after.java         | 5 +++++
 .../testSrc/com/intellij/java/refactoring/PushDownTest.java  | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/pushDown/InterfaceExtends.java
 create mode 100644 java/java-tests/testData/refactoring/pushDown/InterfaceExtends_after.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 52352ccf8606..c29a187f2f24 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
@@ -41,7 +41,6 @@ import com.intellij.refactoring.util.DocCommentPolicy;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
 import com.intellij.util.IncorrectOperationException;
-import java.util.HashSet;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -291,7 +290,7 @@ public class JavaPushDownDelegate extends PushDownDelegate<MemberInfo, PsiMember
               }
             }
             PsiJavaCodeReferenceElement classRef = classType != null ? factory.createReferenceElementByType(classType) : factory.createClassReferenceElement(psiClass);
-            if (psiClass.isInterface()) {
+            if (psiClass.isInterface() && !targetClass.isInterface()) {
               targetClass.getImplementsList().add(classRef);
             } else {
               targetClass.getExtendsList().add(classRef);
diff --git a/java/java-tests/testData/refactoring/pushDown/InterfaceExtends.java b/java/java-tests/testData/refactoring/pushDown/InterfaceExtends.java
new file mode 100644
index 000000000000..a816bd75b055
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/InterfaceExtends.java
@@ -0,0 +1,5 @@
+interface A {}
+
+interface Test extends A { }
+
+interface B extends Test { }
diff --git a/java/java-tests/testData/refactoring/pushDown/InterfaceExtends_after.java b/java/java-tests/testData/refactoring/pushDown/InterfaceExtends_after.java
new file mode 100644
index 000000000000..76d3b297a2c6
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/InterfaceExtends_after.java
@@ -0,0 +1,5 @@
+interface A {}
+
+interface Test extends A { }
+
+interface B extends Test, A { }
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java
index c9b2a1c79ff1..9a0c2ff3a6a3 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java
@@ -58,6 +58,7 @@ public class PushDownTest extends LightRefactoringTestCase {
   public void testOverridingMethodWithSubst() { doTest(); }
   public void testSameClassInterface() { doTestImplements(); }
   public void testPreserveTypeArgs() { doTestImplements(); }
+  public void testInterfaceExtends() { doTestImplements(); }
   public void testSubstTypeArgs() { doTestImplements(); }
   public void testExtensionMethodToInterface() { doTest(); }
   public void testExtensionMethodToClass() { doTest(); }