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 quick fix AddOpenModifierToClassDeclaration quick fix

Browse Source
This commit is contained in:
Nikolay Krasko
2013-03-19 14:52:23 +04:00
parent e239ce7fa7
commit 53944242df
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
+17 -14
View File
@@ -21,19 +21,17 @@ 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.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.psi.JetTypeReference; import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager;
public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> { public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> {
private JetClass classDeclaration; private JetClass classDeclaration;
@@ -48,16 +46,21 @@ public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<Jet
return false; return false;
} }
BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject().getBindingContext(); JetSimpleNameExpression referenceExpression = PsiTreeUtil.findChildOfType(element, JetSimpleNameExpression.class);
JetType type = context.get(BindingContext.TYPE, element); if (referenceExpression == null) {
if (type == null) return false; return false;
DeclarationDescriptor typeDeclarationDescriptor = type.getConstructor().getDeclarationDescriptor();
if (typeDeclarationDescriptor == null) return false;
PsiElement typeDeclaration = BindingContextUtils.descriptorToDeclaration(context, typeDeclarationDescriptor);
if (typeDeclaration instanceof JetClass && typeDeclaration.isWritable()) {
this.classDeclaration = (JetClass) typeDeclaration;
} }
return classDeclaration != null && !classDeclaration.isEnum() && !classDeclaration.isTrait();
PsiReference reference = referenceExpression.getReference();
if (reference != null) {
PsiElement target = reference.resolve();
if (target instanceof JetClass && target.isWritable()) {
classDeclaration = (JetClass) target;
return !(classDeclaration.isEnum() || classDeclaration.isTrait());
}
}
return false;
} }
@NotNull @NotNull