From fc19f1db440a69eb290ef40c6d9df8d9d99aff26 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Jun 2014 22:23:24 +0400 Subject: [PATCH] Minor: improve assertion message in SpecifyTypeExplicitlyFix --- .../jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java index 50f220f038b..350506570c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java @@ -22,9 +22,11 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; @@ -40,7 +42,7 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction { } @Override - public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) { + public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiElement element) { //noinspection unchecked JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class); JetType type = getTypeForDeclaration(declaration); @@ -51,12 +53,12 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction { addTypeAnnotation(project, editor, (JetNamedFunction) declaration, type); } else { - assert false : "Couldn't find property or function"; + assert false : "Couldn't find property or function " + JetPsiUtil.getElementTextWithContext((JetElement) element); } } @Override - public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) { + public boolean isAvailable(@NotNull Project project, @NotNull Editor editor, @NotNull PsiElement element) { //noinspection unchecked JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class); if (declaration instanceof JetProperty) { @@ -66,7 +68,7 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction { setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name")); } else { - assert false : "Couldn't find property or function"; + assert false : "Couldn't find property or function " + JetPsiUtil.getElementTextWithContext((JetElement) element); } return !getTypeForDeclaration(declaration).isError();