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: multiple declared elements in one statement (IDEA-81418)

Browse Source
This commit is contained in:
anna
2012-02-16 18:52:22 +01:00
parent 554e2495c8
commit 1842922b0a
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java
+28 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.refactoring.typeMigration;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -23,6 +24,8 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.ToolWindowId;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiImplUtil;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog;
@@ -47,9 +50,33 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
private TypeMigrationLabeler myLabeler;
public TypeMigrationProcessor(final Project project, final PsiElement root, final TypeMigrationRules rules) {
this(project, new PsiElement[]{root}, rules);
this(project, getRoots(root), rules);
}
private static PsiElement[] getRoots(PsiElement root) {
if (root instanceof PsiVariable) {
final PsiElement parent = root.getParent();
if (parent instanceof PsiDeclarationStatement) {
return ((PsiDeclarationStatement)parent).getDeclaredElements();
}
if (root instanceof PsiField) {
final List<PsiField> fields = new ArrayList<PsiField>();
PsiField field = (PsiField)root;
fields.add(field);
while (true) {
ASTNode comma = PsiImplUtil.skipWhitespaceAndComments(field.getNode().getTreeNext());
if (comma == null || comma.getElementType() != JavaTokenType.COMMA) break;
ASTNode nextField = PsiImplUtil.skipWhitespaceAndComments(comma.getTreeNext());
if (nextField == null || nextField.getElementType() != JavaElementType.FIELD) break;
field = (PsiField)nextField.getPsi();
fields.add(field);
}
return fields.toArray(new PsiElement[fields.size()]);
}
}
return new PsiElement[]{root};
}
public TypeMigrationProcessor(final Project project, final PsiElement[] roots, final TypeMigrationRules rules) {
super(project);
myRoot = roots;