MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: don't lose unmatched method type parameters on replacing (IDEA-298753)

Browse Source 
GitOrigin-RevId: 1da8af70993bcebbf5094c24206b8479f62857ec
This commit is contained in:
Bas Leijdekkers
2022-07-28 11:10:34 +02:00
committed by intellij-monorepo-bot
parent 038c629898
commit ef0d4f8337
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java
View File

@@ -204,10 +204,17 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
copyClassType(originalClass, queryClass, replacementClass);
copyExtendsListIfNotReplaced(originalClass, queryClass, replacementClass);
copyImplementsListIfNotReplaced(originalClass, queryClass, replacementClass);
copyTypeParameterListIfNotReplaced(originalClass, queryClass, replacementClass);
copyUnmatchedMembers(originalClass, originalNamedElements, replacementClass);
}
if (originalNamedElement instanceof PsiTypeParameterListOwner &&
patternNamedElement instanceof PsiTypeParameterListOwner &&
replacementNamedElement instanceof PsiTypeParameterListOwner) {
copyTypeParameterListIfNotReplaced((PsiTypeParameterListOwner)originalNamedElement,
(PsiTypeParameterListOwner)patternNamedElement,
(PsiTypeParameterListOwner)replacementNamedElement);
}
}
}
@@ -656,7 +663,9 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
}
}
private static void copyTypeParameterListIfNotReplaced(PsiClass original, PsiClass query, PsiClass replacement) {
private static void copyTypeParameterListIfNotReplaced(PsiTypeParameterListOwner original,
PsiTypeParameterListOwner query,
PsiTypeParameterListOwner replacement) {
final PsiTypeParameterList originalTypeParameterList = original.getTypeParameterList();
final PsiTypeParameterList queryTypeParameterList = query.getTypeParameterList();
final PsiTypeParameterList replacementTypeParameterList = replacement.getTypeParameterList();
@@ -666,7 +675,11 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
if (originalTypeParameterList.getTypeParameters().length != 0 &&
queryTypeParameterList.getTypeParameters().length == 0 &&
replacementTypeParameterList.getTypeParameters().length == 0) {
replacementTypeParameterList.replace(originalTypeParameterList);
final PsiElement newElement = replacementTypeParameterList.replace(originalTypeParameterList);
final PsiElement prev = originalTypeParameterList.getPrevSibling();
if (prev instanceof PsiWhiteSpace) {
newElement.getParent().addBefore(prev, newElement);
}
}
}