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

type migration: refactoring execution on field/parameter can't start because can't find variable (fixed)

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-06-15 12:34:55 +03:00
parent 140f9d2711
commit a235b55226
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/ChangeTypeSignatureHandler.java
+26 -7
View File
@@ -29,7 +29,9 @@ import com.intellij.refactoring.typeMigration.ui.TypeMigrationDialog;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ChangeTypeSignatureHandler implements RefactoringActionHandler {
private static final Logger LOG = Logger.getInstance("#" + ChangeTypeSignatureHandler.class.getName());
@@ -108,12 +110,29 @@ public class ChangeTypeSignatureHandler implements RefactoringActionHandler {
}
@NotNull
private static PsiElement[] extractReferencedVariables(PsiTypeElement typeElement) {
final PsiDeclarationStatement declaration = PsiTreeUtil.getParentOfType(typeElement, PsiDeclarationStatement.class);
if (declaration == null) return PsiElement.EMPTY_ARRAY;
return Arrays.stream(declaration.getDeclaredElements())
.filter(PsiVariable.class::isInstance)
.filter(e -> ((PsiVariable)e).getTypeElement() == typeElement)
.toArray(PsiElement[]::new);
private static PsiElement[] extractReferencedVariables(@NotNull PsiTypeElement typeElement) {
final PsiElement parent = typeElement.getParent();
if (parent instanceof PsiVariable) {
if (parent instanceof PsiField) {
PsiField aField = (PsiField)parent;
List<PsiField> fields = new ArrayList<>();
while (true) {
fields.add(aField);
aField = PsiTreeUtil.getNextSiblingOfType(aField, PsiField.class);
if (aField == null || aField.getTypeElement() != typeElement) {
return fields.toArray(new PsiElement[fields.size()]);
}
}
}
else if (parent instanceof PsiLocalVariable) {
final PsiDeclarationStatement declaration = PsiTreeUtil.getParentOfType(parent, PsiDeclarationStatement.class);
if (declaration != null) {
return Arrays.stream(declaration.getDeclaredElements()).filter(PsiVariable.class::isInstance).toArray(PsiVariable[]::new);
}
}
return new PsiElement[]{parent};
} else {
return PsiElement.EMPTY_ARRAY;
}
}
}