MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

inline: find this ref corresponding to static imports (IDEA-64508)

Browse Source
This commit is contained in:
anna
2011-01-24 18:31:36 +01:00
parent 2ec7b6f5e6
commit a6e6122719
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java
View File

@@ -78,10 +78,13 @@ public class InlineUtil {
final PsiReferenceExpression methodExpression = ((PsiMethodCallExpression)expr).getMethodExpression();
final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
if (qualifierExpression == null) {
if (((PsiMethod)resolved).getModifierList().hasModifierProperty(PsiModifier.STATIC)) {
methodExpression.setQualifierExpression(elementFactory.createReferenceExpression(thisClass));
final PsiMethod method = (PsiMethod)resolved;
final PsiClass containingClass = method.getContainingClass();
LOG.assertTrue(containingClass != null);
if (method.getModifierList().hasModifierProperty(PsiModifier.STATIC)) {
methodExpression.setQualifierExpression(elementFactory.createReferenceExpression(containingClass));
} else {
methodExpression.setQualifierExpression(createThisExpression(manager, thisClass, refParent));
methodExpression.setQualifierExpression(createThisExpression(manager, containingClass, refParent));
}
}
}

23
java/java-tests/testData/refactoring/inlineLocal/StaticImported.java Normal file
View File

@@ -0,0 +1,23 @@
import java.util.ArrayList;
import java.util.List;
import static Statics._emptyList;
public class Statics {
public static <T> List<T> _emptyList() {
return new ArrayList<T>();
}
}
class Foo {
public static void main(String[] args) {
List<String> v1 = _emptyList();
doSomething(v<caret>1);
}
public static void doSomething(List<String> list) {
}
}

22
java/java-tests/testData/refactoring/inlineLocal/StaticImported.java.after Normal file
View File

@@ -0,0 +1,22 @@
import java.util.ArrayList;
import java.util.List;
import static Statics._emptyList;
public class Statics {
public static <T> List<T> _emptyList() {
return new ArrayList<T>();
}
}
class Foo {
public static void main(String[] args) {
doSomething(Statics.<String>_emptyList());
}
public static void doSomething(List<String> list) {
}
}

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

@@ -123,6 +123,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
doTest(true);
}
public void testStaticImported() throws Exception {
doTest(true);
}
private void doTest(final boolean inlineDef, String conflictMessage) throws Exception {
try {
doTest(inlineDef);