azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't compute type and use reference for MakeClassAnAnnotation quick fix

Browse Source
This commit is contained in:
Nikolay Krasko
2013-03-19 14:41:07 +04:00
parent 35dadbf796
commit e239ce7fa7
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
+19 -18
View File
@@ -21,25 +21,22 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException; import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetAnnotationEntry; import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager;
import static org.jetbrains.jet.lexer.JetTokens.ANNOTATION_KEYWORD; import static org.jetbrains.jet.lexer.JetTokens.ANNOTATION_KEYWORD;
public class MakeClassAnAnnotationClassFix extends JetIntentionAction<JetAnnotationEntry> { public class MakeClassAnAnnotationClassFix extends JetIntentionAction<JetAnnotationEntry> {
private final JetAnnotationEntry annotationEntry; private final JetAnnotationEntry annotationEntry;
private JetType annotationType;
private JetClass annotationClass; private JetClass annotationClass;
public MakeClassAnAnnotationClassFix(@NotNull JetAnnotationEntry annotationEntry) { public MakeClassAnAnnotationClassFix(@NotNull JetAnnotationEntry annotationEntry) {
@@ -53,28 +50,32 @@ public class MakeClassAnAnnotationClassFix extends JetIntentionAction<JetAnnotat
return false; return false;
} }
BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject().getBindingContext(); JetTypeReference typeReference = annotationEntry.getTypeReference();
AnnotationDescriptor annotationDescriptor = context.get(BindingContext.ANNOTATION, annotationEntry); if (typeReference == null) {
if (annotationDescriptor == null) {
return false; return false;
} }
annotationType = annotationDescriptor.getType();
DeclarationDescriptor declarationDescriptor = annotationType.getConstructor().getDeclarationDescriptor(); JetSimpleNameExpression referenceExpression = PsiTreeUtil.findChildOfType(typeReference, JetSimpleNameExpression.class);
if (declarationDescriptor == null) { if (referenceExpression == null) {
return false; return false;
} }
PsiElement declaration = BindingContextUtils.descriptorToDeclaration(context, declarationDescriptor);
if (declaration instanceof JetClass) { PsiReference reference = referenceExpression.getReference();
annotationClass = (JetClass) declaration; if (reference != null) {
return annotationClass.isWritable(); PsiElement target = reference.resolve();
if (target instanceof JetClass) {
annotationClass = (JetClass) target;
return annotationClass.isWritable();
}
} }
return false; return false;
} }
@NotNull @NotNull
@Override @Override
public String getText() { public String getText() {
return JetBundle.message("make.class.annotation.class", annotationType); return JetBundle.message("make.class.annotation.class", annotationClass.getName());
} }
@NotNull @NotNull