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

Made SpecifyTypeExplicitlyAction stateless.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-03 20:29:26 +04:00
parent e498348446
commit 68c7e0d986
1 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+51 -33
View File
@@ -46,9 +46,7 @@ import java.util.Collections;
* @since 4/20/12 * @since 4/20/12
*/ */
public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
private JetType targetType; @NotNull
@NotNull
@Override @Override
public String getFamilyName() { public String getFamilyName() {
return JetBundle.message("specify.type.explicitly.action.family.name"); return JetBundle.message("specify.type.explicitly.action.family.name");
@@ -57,16 +55,21 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@Override @Override
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) { public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
PsiElement parent = element.getParent(); PsiElement parent = element.getParent();
JetType type = getTypeForDeclaration((JetNamedDeclaration) parent);
if (ErrorUtils.isErrorType(type)) {
return;
}
if (parent instanceof JetProperty) { if (parent instanceof JetProperty) {
JetProperty property = (JetProperty) parent; JetProperty property = (JetProperty) parent;
if (targetType == null) { if (property.getPropertyTypeRef() == null) {
removeTypeAnnotation(project, property); addTypeAnnotation(project, property, type);
} else { } else {
addTypeAnnotation(project, property, targetType); removeTypeAnnotation(project, property);
} }
} else if (parent instanceof JetNamedFunction) { } else if (parent instanceof JetNamedFunction) {
assert targetType != null; JetNamedFunction function = (JetNamedFunction) parent;
addTypeAnnotation(project, (JetFunction) parent, targetType); assert function.getReturnTypeRef() == null;
addTypeAnnotation(project, function, type);
} else { } else {
assert false; assert false;
} }
@@ -74,9 +77,13 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@Override @Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
if (element.getParent() instanceof JetProperty && !PsiTreeUtil.isAncestor(((JetProperty) element.getParent()).getInitializer(), element, false)) { PsiElement parent = element.getParent();
if (((JetProperty)element.getParent()).getPropertyTypeRef() != null) { if (!(parent instanceof JetNamedDeclaration)) {
targetType = null; return false;
}
JetNamedDeclaration declaration = (JetNamedDeclaration) parent;
if (declaration instanceof JetProperty && !PsiTreeUtil.isAncestor(((JetProperty) declaration).getInitializer(), element, false)) {
if (((JetProperty) declaration).getPropertyTypeRef() != null) {
setText(JetBundle.message("specify.type.explicitly.remove.action.name")); setText(JetBundle.message("specify.type.explicitly.remove.action.name"));
return true; return true;
} }
@@ -84,38 +91,49 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
setText(JetBundle.message("specify.type.explicitly.add.action.name")); setText(JetBundle.message("specify.type.explicitly.add.action.name"));
} }
} }
else if (element.getParent() instanceof JetNamedFunction && ((JetNamedFunction) element.getParent()).getReturnTypeRef() == null else if (declaration instanceof JetNamedFunction && ((JetNamedFunction) declaration).getReturnTypeRef() == null
&& !((JetNamedFunction) element.getParent()).hasBlockBody()) { && !((JetNamedFunction) declaration).hasBlockBody()) {
setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name")); setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name"));
} }
else { else {
return false; return false;
} }
BindingContext bindingContext = AnalyzeSingleFileUtil.getContextForSingleFile((JetFile)element.getContainingFile()); if (ErrorUtils.isErrorType(getTypeForDeclaration(declaration))) {
DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element.getParent());
if (descriptor instanceof VariableDescriptor) {
targetType = ((VariableDescriptor) descriptor).getType();
}
else if (descriptor instanceof SimpleFunctionDescriptor) {
targetType = ((SimpleFunctionDescriptor) descriptor).getReturnType();
}
else {
assert false;
}
if (targetType == null || ErrorUtils.isErrorType(targetType)) {
return false; return false;
} }
if (isDisabledForError()) { return !isDisabledForError() || !hasPublicMemberDiagnostic(declaration);
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { }
if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && element.getParent() == diagnostic.getPsiElement()) {
return false;
} private static boolean hasPublicMemberDiagnostic(@NotNull JetNamedDeclaration declaration) {
BindingContext bindingContext = AnalyzeSingleFileUtil.getContextForSingleFile((JetFile)declaration.getContainingFile());
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
//noinspection ConstantConditions
if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && declaration == diagnostic.getPsiElement()) {
return true;
} }
} }
return true; return false;
}
@NotNull
private static JetType getTypeForDeclaration(@NotNull JetNamedDeclaration declaration) {
BindingContext bindingContext = AnalyzeSingleFileUtil.getContextForSingleFile((JetFile)declaration.getContainingFile());
DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration);
JetType type;
if (descriptor instanceof VariableDescriptor) {
type = ((VariableDescriptor) descriptor).getType();
}
else if (descriptor instanceof SimpleFunctionDescriptor) {
type = ((SimpleFunctionDescriptor) descriptor).getReturnType();
}
else {
return ErrorUtils.createErrorType("unknown declaration type");
}
return type == null ? ErrorUtils.createErrorType("null type") : type;
} }
protected boolean isDisabledForError() { protected boolean isDisabledForError() {