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

Copied and rewritten adding type for functions.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-03 04:17:04 +04:00
parent ab96dcc69c
commit c80ac15b8a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+14 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
@@ -36,7 +37,6 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening; import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening;
import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil; import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
import org.jetbrains.jet.plugin.quickfix.AddReturnTypeFix;
import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.resolve.DescriptorRenderer;
import java.util.Collections; import java.util.Collections;
@@ -88,7 +88,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
} }
} else if (parent instanceof JetNamedFunction) { } else if (parent instanceof JetNamedFunction) {
assert targetType != null; assert targetType != null;
parent.replace(AddReturnTypeFix.addFunctionType(project, (JetFunction) parent, targetType)); addTypeAnnotation(project, (JetFunction) parent, targetType);
} else { } else {
assert false; assert false;
} }
@@ -154,6 +154,18 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
ReferenceToClassesShortening.compactReferenceToClasses(Collections.singletonList(property)); ReferenceToClassesShortening.compactReferenceToClasses(Collections.singletonList(property));
} }
public static void addTypeAnnotation(Project project, JetFunction function, @NotNull JetType exprType) {
JetFunction newFunction = (JetFunction) function.copy();
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType));
Pair<PsiElement, PsiElement> colon = JetPsiFactory.createColon(project);
JetParameterList valueParameterList = newFunction.getValueParameterList();
assert valueParameterList != null;
newFunction.addAfter(typeReference, valueParameterList);
newFunction.addRangeAfter(colon.getFirst(), colon.getSecond(), valueParameterList);
function = (JetFunction) function.replace(newFunction);
ReferenceToClassesShortening.compactReferenceToClasses(Collections.singletonList(function));
}
public static void removeTypeAnnotation(Project project, JetProperty property) { public static void removeTypeAnnotation(Project project, JetProperty property) {
JetTypeReference propertyTypeRef = property.getPropertyTypeRef(); JetTypeReference propertyTypeRef = property.getPropertyTypeRef();
if (propertyTypeRef == null) return; if (propertyTypeRef == null) return;