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 text fixed

Browse Source
This commit is contained in:
anna
2010-11-08 21:29:28 +03:00
parent ac369f3098
commit 5f484eea21
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+3 -2
View File
@@ -480,8 +480,9 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
final VariableInplaceRenamer renamer = new VariableInplaceRenamer(elementToRename, editor){
@Override
protected void addAdditionalVariables(TemplateBuilderImpl builder) {
builder.replaceElement(elementToRename.getTypeElement(), "Variable_Type", ReassignVariableUtil
.createExpression(typeSelectorManager), false, true);
final PsiTypeElement typeElement = elementToRename.getTypeElement();
builder.replaceElement(typeElement, "Variable_Type", ReassignVariableUtil
.createExpression(typeSelectorManager, typeElement.getText()), false, true);
}
};
renamer.setAdvertisementText(
java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java
+4 -4
View File
@@ -150,24 +150,24 @@ public class ReassignVariableUtil {
}
}
static Expression createExpression(final TypeSelectorManagerImpl typeSelectorManager) {
static Expression createExpression(final TypeSelectorManagerImpl typeSelectorManager, final String defaultText) {
final PsiType[] types = typeSelectorManager.getTypesForAll();
return new Expression() {
@Override
public com.intellij.codeInsight.template.Result calculateResult(ExpressionContext context) {
return new TextResult(typeSelectorManager.getDefaultType().getPresentableText());
return new TextResult(defaultText);
}
@Override
public com.intellij.codeInsight.template.Result calculateQuickResult(ExpressionContext context) {
return new TextResult(typeSelectorManager.getDefaultType().getPresentableText());
return new TextResult(defaultText);
}
@Override
public LookupElement[] calculateLookupItems(ExpressionContext context) {
LookupElement[] result = new LookupElement[types.length];
for (int i = 0, typesLength = types.length; i < typesLength; i++) {
result[i] = LookupElementBuilder.create(types[i].getPresentableText());
result[i] = LookupElementBuilder.create(types[i], types[i].getPresentableText());
}
return result;
}