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

Add removeTypeAnnotation(JetFunction function) utility.

Browse Source
This commit is contained in:
Wojciech Lopata
2013-02-09 11:01:11 +01:00
committed by Andrey Breslav
parent 3ec9cd817f
commit a880b2a699
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+9 -6
View File
@@ -265,21 +265,24 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
return null; return null;
} }
private static void removeTypeAnnotation(@NotNull JetNamedDeclaration property, @Nullable JetTypeReference typeReference) { private static void removeTypeAnnotation(@Nullable PsiElement removeAfter, @Nullable JetTypeReference typeReference) {
if (removeAfter == null) return;
if (typeReference == null) return; if (typeReference == null) return;
PsiElement identifier = property.getNameIdentifier(); PsiElement sibling = removeAfter.getNextSibling();
if (identifier == null) return;
PsiElement sibling = identifier.getNextSibling();
if (sibling == null) return; if (sibling == null) return;
PsiElement nextSibling = typeReference.getNextSibling(); PsiElement nextSibling = typeReference.getNextSibling();
sibling.getParent().getNode().removeRange(sibling.getNode(), nextSibling == null ? null : nextSibling.getNode()); sibling.getParent().getNode().removeRange(sibling.getNode(), nextSibling == null ? null : nextSibling.getNode());
} }
public static void removeTypeAnnotation(JetProperty property) { public static void removeTypeAnnotation(JetProperty property) {
removeTypeAnnotation(property, property.getTypeRef()); removeTypeAnnotation(property.getNameIdentifier(), property.getTypeRef());
} }
public static void removeTypeAnnotation(JetParameter parameter) { public static void removeTypeAnnotation(JetParameter parameter) {
removeTypeAnnotation(parameter, parameter.getTypeReference()); removeTypeAnnotation(parameter.getNameIdentifier(), parameter.getTypeReference());
}
public static void removeTypeAnnotation(JetFunction function) {
removeTypeAnnotation(function.getValueParameterList(), function.getReturnTypeRef());
} }
} }