MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

generate delegate: filter existing methods (IDEA-200281)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-10-11 18:38:59 +02:00
parent cc35fa8881
commit ed29637fe5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
+4 -2
View File
@@ -34,8 +34,6 @@ import com.intellij.psi.scope.util.PsiScopesUtil;
import com.intellij.psi.util.*;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import java.util.HashMap;
import java.util.HashSet;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -262,6 +260,10 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler
}
}
if (MethodSignatureUtil.findMethodBySuperMethod(containingClass, method, false) != null) {
continue;
}
PsiSubstitutor superSubstitutor = superSubstitutors.get(superClass);
if (superSubstitutor == null) {
superSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(superClass, targetClass, substitutor);