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: insert suggested name by type on restart when current variable was empty (IDEA-89382)

Browse Source
This commit is contained in:
anna
2012-07-31 16:51:27 +02:00
parent 3ba0b7dff9
commit 1b5df35a54
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField
@Override
protected String[] suggestNames(PsiType defaultType, String propName) {
return IntroduceConstantDialog.createNameSuggestionGenerator(propName, myExpr, JavaCodeStyleManager.getInstance(myProject), null,
return IntroduceConstantDialog.createNameSuggestionGenerator(propName, myExpr != null && myExpr.isValid() ? myExpr : null, JavaCodeStyleManager.getInstance(myProject), null,
myParentClass)
.getSuggestedNameInfo(defaultType).names;
}
java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop
@Override
protected String[] suggestNames(PsiType defaultType, String propName) {
return suggestFieldName(defaultType, (PsiLocalVariable)getLocalVariable(), myExpr, myStatic, myParentClass).names;
return suggestFieldName(defaultType, (PsiLocalVariable)getLocalVariable(), myExpr != null && myExpr.isValid() ? myExpr : null, myStatic, myParentClass).names;
}
public static SuggestedNameInfo suggestFieldName(@Nullable PsiType defaultType,
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+2 -2
View File
@@ -282,8 +282,8 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase {
return new NameSuggestionsGenerator() {
public SuggestedNameInfo getSuggestedNameInfo(PsiType type) {
final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
SuggestedNameInfo info = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, propName, expr, type);
if (expr != null) {
SuggestedNameInfo info = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, propName, expr != null && expr.isValid() ? expr : null, type);
if (expr != null && expr.isValid()) {
info = codeStyleManager.suggestUniqueVariableName(info, expr, true);
}
final String[] strings = AbstractJavaInplaceIntroducer.appendUnresolvedExprName(JavaCompletionUtil