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

type migration: do not migrate super method if return-type isn't same

Browse Source
This commit is contained in:
Dmitry Batkovich
2015-11-23 16:59:10 +03:00
parent 43a78a8126
commit 9ba225cde5
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/Util.java
+23 -3
View File
@@ -17,8 +17,12 @@ package com.intellij.refactoring.typeMigration;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.SmartList;
import com.intellij.util.containers.Queue;
import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* @author db
* Date: Nov 4, 2004
@@ -39,9 +43,25 @@ public class Util {
@Nullable
public static PsiElement normalizeElement(final PsiElement element) {
if (element instanceof PsiMethod) {
final PsiMethod superMethod = ((PsiMethod)element).findDeepestSuperMethod();
return superMethod == null ? element : superMethod;
final PsiMethod method = (PsiMethod)element;
final PsiType initialMethodReturnType = method.getReturnType();
if (initialMethodReturnType == null) {
return null;
}
final List<PsiMethod> normalized = new SmartList<PsiMethod>();
final Queue<PsiMethod> queue = new Queue<PsiMethod>(1);
queue.addLast(method);
while (!queue.isEmpty()) {
final PsiMethod currentMethod = queue.pullFirst();
if (initialMethodReturnType.equals(currentMethod.getReturnType())) {
for (PsiMethod toConsume : currentMethod.findSuperMethods(false)) {
queue.addLast(toConsume);
}
normalized.add(currentMethod);
}
}
//TODO Dmitry Batkovich multiple result is possible
return normalized.isEmpty() ? element : normalized.get(normalized.size() - 1);
}
else if (element instanceof PsiParameter && element.getParent() instanceof PsiParameterList) {
final PsiElement declarationScope = ((PsiParameter)element).getDeclarationScope();