From 899a28f5ecd1a4e6ac3381f97c123898adf8ebad Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 5 May 2015 14:38:27 +0300 Subject: [PATCH] Converted to Kotlin (step 2) --- ...eExplicitlyAction.java => SpecifyTypeExplicitlyAction.kt} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename idea/src/org/jetbrains/kotlin/idea/intentions/{SpecifyTypeExplicitlyAction.java => SpecifyTypeExplicitlyAction.kt} (98%) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.kt similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.kt index 21c8993a367..23c6d000ad1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.kt @@ -121,7 +121,10 @@ public class SpecifyTypeExplicitlyAction : PsiElementBaseIntentionAction() { public fun getTypeForDeclaration(declaration: JetCallableDeclaration): JetType { val bindingContext = declaration.getContainingJetFile().analyzeFully() - val type = if (bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) != null) bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration).getReturnType() else null + val type = if (bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) != null) + bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration).getReturnType() + else + null return type ?: ErrorUtils.createErrorType("null type") }