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

correct field/getters naming in extract method object (EA-26268 - assert: ExtractMethodObjectProcessor.b)

Browse Source
This commit is contained in:
anna
2011-04-15 20:24:51 +02:00
parent c5bfe74da9
commit b4a99e051b
4 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
+12 -6
View File
@@ -238,11 +238,14 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
final PsiField outputField = myOutputFields[i];
final String name = getPureName(var);
LOG.assertTrue(name != null);
final PsiField field;
if (outputField != null) {
var2FieldNames.put(var.getName(), outputField.getName());
myInnerClass.add(outputField);
field = outputField;
} else {
field = PropertyUtil.findPropertyField(myProject, myInnerClass, name, false);
}
final PsiField field = PropertyUtil.findPropertyField(myProject, myInnerClass, name, false);
LOG.assertTrue(field != null, "i:" + i + "; output variables: " + Arrays.toString(outputVariables) + "; parameters: " + Arrays.toString(getMethod().getParameterList().getParameters()) + "; output field: " + outputField );
myInnerClass.add(PropertyUtil.generateGetterPrototype(field));
}
@@ -364,8 +367,8 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
private String getPureName(PsiVariable var) {
final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(myProject);
return var instanceof PsiLocalVariable
? styleManager.variableNameToPropertyName(var.getName(), VariableKind.LOCAL_VARIABLE) : styleManager.variableNameToPropertyName(var.getName(), VariableKind.PARAMETER);
final VariableKind kind = var instanceof PsiLocalVariable ? VariableKind.LOCAL_VARIABLE : VariableKind.PARAMETER;
return styleManager.variableNameToPropertyName(var.getName(), kind);
}
public PsiExpression processMethodDeclaration( PsiExpressionList expressionList) throws IncorrectOperationException {
@@ -716,9 +719,12 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
String name = variable.getName();
LOG.assertTrue(name != null);
PsiStatement st = null;
final String pureName = getPureName(variable);
final int varIdxInOutput = ArrayUtil.find(myOutputVariables, variable);
final String getterName = varIdxInOutput > -1 && myOutputFields[varIdxInOutput] != null ? PropertyUtil.suggestGetterName(myProject, myOutputFields[varIdxInOutput]) : PropertyUtil.suggestGetterName(pureName, variable.getType());
if (isDeclaredInside(variable)) {
st = myElementFactory.createStatementFromText(
variable.getType().getCanonicalText() + " " + name + " = " + object + "." + PropertyUtil.suggestGetterName(getPureName(variable), variable.getType()) + "();",
variable.getType().getCanonicalText() + " " + name + " = " + object + "." + getterName + "();",
myInnerMethod);
if (reassigned.contains(new ControlFlowUtil.VariableInfo(variable, null))) {
final PsiElement[] psiElements = ((PsiDeclarationStatement)st).getDeclaredElements();
@@ -728,8 +734,8 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
}
}
else {
if (ArrayUtil.find(myOutputVariables, variable) != -1) {
st = myElementFactory.createStatementFromText(name + " = " + object + "." + PropertyUtil.suggestGetterName(getPureName(variable), variable.getType()) + "();", myInnerMethod);
if (varIdxInOutput != -1) {
st = myElementFactory.createStatementFromText(name + " = " + object + "." + getterName + "();", myInnerMethod);
}
}
if (st != null) {