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

inplace introduce variable: qualify expression if necessary (IDEA-81430)

Browse Source
This commit is contained in:
anna
2012-02-16 18:52:25 +01:00
parent edbf9c3db0
commit 4188ab657c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+11
View File
@@ -37,6 +37,8 @@ import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.JavaRefactoringSettings;
import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer;
import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer;
import com.intellij.refactoring.rename.inplace.ResolveSnapshotProvider;
import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
import com.intellij.ui.NonFocusableCheckBox;
import org.jetbrains.annotations.NotNull;
@@ -67,6 +69,8 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
protected final SmartTypePointer myDefaultType;
protected final TypeExpression myExpression;
private ResolveSnapshotProvider.ResolveSnapshot myConflictResolver;
public JavaVariableInplaceIntroducer(final Project project,
final TypeExpression expression,
final Editor editor,
@@ -93,6 +97,10 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
rangeMarkers.toArray(new RangeMarker[rangeMarkers.size()]));
}
myExpression = expression;
if (declarationStatement != null) {
final ResolveSnapshotProvider resolveSnapshotProvider = VariableInplaceRenamer.INSTANCE.forLanguage(declarationStatement.getLanguage());
myConflictResolver = resolveSnapshotProvider != null ? resolveSnapshotProvider.createSnapshot(declarationStatement) : null;
}
final PsiType defaultType = elementToRename.getType();
myDefaultType = SmartTypePointerManager.getInstance(project).createSmartTypePointer(defaultType);
setAdvertisementText(getAdvertisementText(declarationStatement, defaultType, hasTypeSuggestion));
@@ -146,6 +154,9 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
appendTypeCasts(getOccurrenceMarkers(), file, myProject, psiVariable);
if (myConflictResolver != null) {
myConflictResolver.apply(psiVariable.getName());
}
}
});
}