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

add single static import on type elements, e.g. inside annotations, type elements (IDEA-22130)

Browse Source
This commit is contained in:
anna
2011-08-26 13:34:31 +02:00
parent 6794da37dd
commit df6d79ce8a
5 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
+29 -27
View File
@@ -55,9 +55,9 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc
public static String getStaticImportClass(@NotNull PsiElement element) {
if (!PsiUtil.isLanguageLevel5OrHigher(element)) return null;
PsiFile file = element.getContainingFile();
if (element instanceof PsiIdentifier && element.getParent() instanceof PsiReferenceExpression &&
((PsiReferenceExpression)element.getParent()).getQualifierExpression() != null) {
PsiReferenceExpression refExpr = (PsiReferenceExpression)element.getParent();
if (element instanceof PsiIdentifier && element.getParent() instanceof PsiJavaCodeReferenceElement &&
((PsiJavaCodeReferenceElement)element.getParent()).getQualifier() != null) {
PsiJavaCodeReferenceElement refExpr = (PsiJavaCodeReferenceElement)element.getParent();
PsiReferenceParameterList parameterList = refExpr.getParameterList();
if (parameterList != null && parameterList.getFirstChild() != null) return null;
PsiElement resolved = refExpr.resolve();
@@ -101,17 +101,18 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc
public static void invoke(PsiFile file, PsiElement element) {
if (!CodeInsightUtilBase.prepareFileForWrite(file)) return;
final PsiReferenceExpression refExpr = (PsiReferenceExpression)element.getParent();
final PsiJavaCodeReferenceElement refExpr = (PsiJavaCodeReferenceElement)element.getParent();
final PsiElement resolved = refExpr.resolve();
file.accept(new JavaRecursiveElementWalkingVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
super.visitReferenceExpression(expression);
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
String referenceName = refExpr.getReferenceName();
if (referenceName != null && referenceName.equals(expression.getReferenceName())) {
PsiElement resolved = expression.resolve();
if (referenceName != null && referenceName.equals(reference.getReferenceName())) {
PsiElement resolved = reference.resolve();
if (resolved != null) {
expression.putUserData(TEMP_REFERENT_USER_DATA, resolved);
reference.putUserData(TEMP_REFERENT_USER_DATA, resolved);
}
}
}
@@ -124,35 +125,37 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc
}
file.accept(new JavaRecursiveElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
if (expression.getParameterList() != null &&
expression.getParameterList().getFirstChild() != null) return;
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
if (refExpr.getReferenceName().equals(expression.getReferenceName())) {
final PsiExpression qualifierExpression = expression.getQualifierExpression();
PsiElement referent = expression.getUserData(TEMP_REFERENT_USER_DATA);
if (!expression.isQualified()) {
if (reference.getParameterList() != null &&
reference.getParameterList().getFirstChild() != null) return;
if (referent instanceof PsiMember && referent != expression.resolve()) {
PsiElementFactory factory = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory();
if (refExpr.getReferenceName().equals(reference.getReferenceName())) {
final PsiElement qualifierExpression = reference.getQualifier();
PsiElement referent = reference.getUserData(TEMP_REFERENT_USER_DATA);
if (!reference.isQualified()) {
if (referent instanceof PsiMember && referent != reference.resolve()) {
PsiElementFactory factory = JavaPsiFacade.getInstance(reference.getProject()).getElementFactory();
try {
PsiReferenceExpression copy = (PsiReferenceExpression)factory.createExpressionFromText("A." + expression.getReferenceName(), null);
expression = (PsiReferenceExpression)expression.replace(copy);
PsiReferenceExpression copy = (PsiReferenceExpression)factory.createExpressionFromText("A." + reference.getReferenceName(), null);
reference = (PsiReferenceExpression)reference.replace(copy);
((PsiReferenceExpression)qualifierExpression).bindToElement(((PsiMember)referent).getContainingClass());
}
catch (IncorrectOperationException e) {
LOG.error (e);
}
}
expression.putUserData(TEMP_REFERENT_USER_DATA, null);
reference.putUserData(TEMP_REFERENT_USER_DATA, null);
} else {
if (qualifierExpression instanceof PsiReferenceExpression) {
PsiElement aClass = ((PsiReferenceExpression)qualifierExpression).resolve();
if (qualifierExpression instanceof PsiJavaCodeReferenceElement) {
PsiElement aClass = ((PsiJavaCodeReferenceElement)qualifierExpression).resolve();
if (aClass instanceof PsiClass && InheritanceUtil.isInheritorOrSelf((PsiClass)aClass, ((PsiMember)resolved).getContainingClass(), true)) {
boolean foundMemberByName = false;
if (referent instanceof PsiMember) {
final String memberName = ((PsiMember)referent).getName();
final PsiClass containingClass = PsiTreeUtil.getParentOfType(expression, PsiClass.class);
final PsiClass containingClass = PsiTreeUtil.getParentOfType(reference, PsiClass.class);
if (containingClass != null) {
foundMemberByName |= containingClass.findFieldByName(memberName, true) != null;
foundMemberByName |= containingClass.findMethodsByName(memberName, true).length > 0;
@@ -169,10 +172,9 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc
}
}
}
expression.putUserData(TEMP_REFERENT_USER_DATA, null);
reference.putUserData(TEMP_REFERENT_USER_DATA, null);
}
super.visitReferenceExpression(expression);
super.visitReferenceElement(reference);
}
});
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterSingleCodeReference.java
+13
View File
@@ -0,0 +1,13 @@
// "Add static import for 'test.Bar.Foo'" "true"
package test;
import static test.Bar.Foo;
class Bar {
public static class Foo {}
}
public class OOO{
{
Foo foo;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterSingleCodeReferenceInAnnotation.java
+11
View File
@@ -0,0 +1,11 @@
// "Add static import for 'test.Bar.Foo'" "true"
package test;
import static test.Bar.Foo;
class Bar {
public static @interface Foo {}
}
@Foo
public class OOO {
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeSingleCodeReference.java
+11
View File
@@ -0,0 +1,11 @@
// "Add static import for 'test.Bar.Foo'" "true"
package test;
class Bar {
public static class Foo {}
}
public class OOO{
{
Bar.<caret>Foo foo;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeSingleCodeReferenceInAnnotation.java
+9
View File
@@ -0,0 +1,9 @@
// "Add static import for 'test.Bar.Foo'" "true"
package test;
class Bar {
public static @interface Foo {}
}
@Bar.<caret>Foo
public class OOO {
}