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

Added functions logic in SpecifyTypesExplicitlyAction.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-03 03:49:10 +04:00
parent 322578b773
commit 78ab4b6ae7
11 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+1
View File
@@ -30,6 +30,7 @@ new.kotlin.file.action=Kotlin File
import.fix=Import
imports.chooser.title=Imports
specify.type.explicitly.action.family.name=Specify Type Explicitly
specify.type.explicitly.add.return.type.action.name=Specify Return Type Explicitly
specify.type.explicitly.add.action.name=Specify Type Explicitly
specify.type.explicitly.remove.action.name=Remove Explicitly Specified Type
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+56 -23
View File
@@ -23,16 +23,20 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetFunction;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
import org.jetbrains.jet.plugin.quickfix.AddReturnTypeFix;
import org.jetbrains.jet.plugin.refactoring.introduceVariable.JetChangePropertyActions;
/**
@@ -41,6 +45,8 @@ import org.jetbrains.jet.plugin.refactoring.introduceVariable.JetChangePropertyA
*/
public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
private JetType targetType;
private boolean isFunction;
private boolean disabledForError;
public SpecifyTypeExplicitlyAction() {
@@ -54,7 +60,12 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@NotNull
@Override
public String getText() {
return targetType == null ? JetBundle.message("specify.type.explicitly.remove.action.name") : JetBundle.message("specify.type.explicitly.add.action.name");
if (isFunction) {
return JetBundle.message("specify.type.explicitly.add.return.type.action.name");
}
else {
return targetType == null ? JetBundle.message("specify.type.explicitly.remove.action.name") : JetBundle.message("specify.type.explicitly.add.action.name");
}
}
@NotNull
@@ -65,37 +76,59 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
JetProperty property = (JetProperty)element.getParent();
if (targetType == null) {
JetChangePropertyActions.removeTypeAnnotation(project, property);
PsiElement parent = element.getParent();
if (parent instanceof JetProperty) {
JetProperty property = (JetProperty) parent;
if (targetType == null) {
JetChangePropertyActions.removeTypeAnnotation(project, property);
} else {
JetChangePropertyActions.addTypeAnnotation(project, property, targetType);
}
} else if (parent instanceof JetNamedFunction) {
assert targetType != null;
parent.replace(AddReturnTypeFix.addFunctionType(project, (JetFunction) parent, targetType));
} else {
JetChangePropertyActions.addTypeAnnotation(project, property, targetType);
assert false;
}
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
if (!(element.getParent() instanceof JetProperty) || PsiTreeUtil.isAncestor(((JetProperty)element.getParent()).getInitializer(), element, false)) {
if (element.getParent() instanceof JetProperty && !PsiTreeUtil.isAncestor(((JetProperty) element.getParent()).getInitializer(), element, false)) {
isFunction = false;
if (((JetProperty)element.getParent()).getPropertyTypeRef() != null) {
targetType = null;
return true;
}
}
else if (element.getParent() instanceof JetNamedFunction && ((JetNamedFunction) element.getParent()).getReturnTypeRef() == null
&& !((JetNamedFunction) element.getParent()).hasBlockBody()) {
isFunction = true;
}
else {
return false;
}
JetProperty property = (JetProperty)element.getParent();
boolean hasTypeSpecified = property.getPropertyTypeRef() != null;
if (hasTypeSpecified) {
targetType = null;
} else {
BindingContext bindingContext = AnalyzeSingleFileUtil.getContextForSingleFile((JetFile)element.getContainingFile());
DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property);
assert descriptor instanceof VariableDescriptor;
targetType = ((VariableDescriptor)descriptor).getType();
if (ErrorUtils.isErrorType(targetType)) {
return false;
}
if (disabledForError) {
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && property == diagnostic.getPsiElement()) {
return false;
}
BindingContext bindingContext = AnalyzeSingleFileUtil.getContextForSingleFile((JetFile)element.getContainingFile());
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;
}
if (disabledForError) {
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && element.getParent() == diagnostic.getPsiElement()) {
return false;
}
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
-2
View File
@@ -114,8 +114,6 @@ public class QuickFixes {
factories.put(REDUNDANT_MODIFIER_IN_GETTER, removeRedundantModifierFactory);
factories.put(ILLEGAL_MODIFIER, removeModifierFactory);
factories.put(PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE, AddReturnTypeFix.createFactory());
JetIntentionActionFactory changeToBackingFieldFactory = ChangeToBackingFieldFix.createFactory();
factories.put(INITIALIZATION_USING_BACKING_FIELD_CUSTOM_SETTER, changeToBackingFieldFactory);
factories.put(INITIALIZATION_USING_BACKING_FIELD_OPEN_SETTER, changeToBackingFieldFactory);
idea/testData/quickfix/typeAddition/afterInternalProtectedFunWithoutReturnType.kt
+6
View File
@@ -0,0 +1,6 @@
// "Specify Return Type Explicitly" "true"
package a
class A() {
internal protected fun foo() : Int = 1
}
idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "true"
// "Specify Return Type Explicitly" "true"
package a
class A() {
idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "true"
// "Specify Return Type Explicitly" "true"
package a
class A() {
idea/testData/quickfix/typeAddition/beforeInternalProtectedFunWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "false"
// "Specify Return Type Explicitly" "true"
package a
class A() {
idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "false"
// "Specify Return Type Explicitly" "false"
class A() {
public val <caret>t = foo()
idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "true"
// "Specify Return Type Explicitly" "true"
package a
class A() {
idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "false"
// "Specify Return Type Explicitly" "false"
package a
class A() {
idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add return type declaration" "true"
// "Specify Return Type Explicitly" "true"
package a
class A() {