diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java index d4a2e3bcdd5b..187b0814ac60 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java @@ -222,7 +222,7 @@ public class JavaPullUpHelper implements PullUpHelper { RefactoringUtil.replaceMovedMemberTypeParameters(methodCopy, PsiUtil.typeParametersIterable(mySourceClass), substitutor, elementFactory); Language language = myTargetSuperClass.getLanguage(); - final PsiMethod superClassMethod = myTargetSuperClass.findMethodBySignature(methodCopy, false); + final PsiMethod superClassMethod = MethodSignatureUtil.findMethodBySuperSignature(myTargetSuperClass, method.getSignature(substitutor), false); if (superClassMethod != null && superClassMethod.findDeepestSuperMethods().length == 0 || method.findSuperMethods(myTargetSuperClass).length == 0) { deleteOverrideAnnotationIfFound(methodCopy); diff --git a/java/java-tests/testData/refactoring/pullUp/SubstituteOverrideToMerge_after.java b/java/java-tests/testData/refactoring/pullUp/SubstituteOverrideToMerge_after.java index 08a2b05e7a3b..e3e051fe3262 100644 --- a/java/java-tests/testData/refactoring/pullUp/SubstituteOverrideToMerge_after.java +++ b/java/java-tests/testData/refactoring/pullUp/SubstituteOverrideToMerge_after.java @@ -1,7 +1,4 @@ abstract class C { - abstract void foo(T t); - - @Override void foo(T t) { }