MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce parameter: fix getter call

Browse Source
This commit is contained in:
anna
2010-02-03 21:41:39 +03:00
parent 6a3f331f04
commit dc35e44ab4
4 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
View File

@@ -227,10 +227,9 @@ public class OldReferenceResolver {
if (JavaPsiFacade.getInstance(psiField.getProject()).getResolveHelper().isAccessible(getter, newExpr, null)) {
PsiElementFactory factory = JavaPsiFacade.getInstance(newExpr.getProject()).getElementFactory();
String id = getter.getName();
final PsiElement parent = newExpr.getParent();
String qualifier = null;
if (parent instanceof PsiReferenceExpression) {
final PsiExpression qualifierExpression = ((PsiReferenceExpression)parent).getQualifierExpression();
if (newExpr instanceof PsiReferenceExpression) {
final PsiExpression qualifierExpression = ((PsiReferenceExpression)newExpr).getQualifierExpression();
if (qualifierExpression != null) {
qualifier = qualifierExpression.getText();
}
@@ -238,8 +237,8 @@ public class OldReferenceResolver {
PsiMethodCallExpression getterCall =
(PsiMethodCallExpression)factory.createExpressionFromText((qualifier != null ? qualifier + "." : "") + id + "()", null);
getterCall = (PsiMethodCallExpression)CodeStyleManager.getInstance(myProject).reformat(getterCall);
if (parent != null) {
newExpr = parent.replace(getterCall);
if (newExpr.getParent() != null) {
newExpr = newExpr.replace(getterCall);
}
else {
newExpr = getterCall;

17
java/java-tests/testData/refactoring/introduceParameter/afterStaticFieldWithGetterReplacement.java Normal file
View File

@@ -0,0 +1,17 @@
public class R {
private static int ourInt;
public static int getOurInt() {
return ourInt;
}
public static void doSmth(final int anObject) {
System.out.println(anObject);
}
}
class Usage {
void foo() {
R.doSmth(R.getOurInt());
}
}

17
java/java-tests/testData/refactoring/introduceParameter/beforeStaticFieldWithGetterReplacement.java Normal file
View File

@@ -0,0 +1,17 @@
public class R {
private static int ourInt;
public static int getOurInt() {
return ourInt;
}
public static void doSmth() {
System.out.println(<selection>ourInt</selection>);
}
}
class Usage {
void foo() {
R.doSmth();
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
View File

@@ -236,6 +236,10 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase {
"Incomplete call(Root()): expected to delete the 1 parameter but only 0 parameters found");
}
public void testStaticFieldWithGetterReplacement() throws Exception {
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, false, true, false);
}
private void doTestThroughHandler() throws Exception {
configureByFile("/refactoring/introduceParameter/before" + getTestName(false) + ".java");
new IntroduceParameterHandler().invoke(getProject(), myEditor, myFile, new DataContext() {