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

Minor: improve assertion message in SpecifyTypeExplicitlyFix

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-20 22:23:24 +04:00
parent 868e0d9306
commit fc19f1db44
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
+6 -4
View File
@@ -22,9 +22,11 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull; 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.JetNamedDeclaration;
import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.JetProperty; 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.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
@@ -40,7 +42,7 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction {
} }
@Override @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 //noinspection unchecked
JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class); JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class);
JetType type = getTypeForDeclaration(declaration); JetType type = getTypeForDeclaration(declaration);
@@ -51,12 +53,12 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction {
addTypeAnnotation(project, editor, (JetNamedFunction) declaration, type); addTypeAnnotation(project, editor, (JetNamedFunction) declaration, type);
} }
else { else {
assert false : "Couldn't find property or function"; assert false : "Couldn't find property or function " + JetPsiUtil.getElementTextWithContext((JetElement) element);
} }
} }
@Override @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 //noinspection unchecked
JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class); JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetProperty.class, JetNamedFunction.class);
if (declaration instanceof JetProperty) { if (declaration instanceof JetProperty) {
@@ -66,7 +68,7 @@ public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction {
setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name")); setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name"));
} }
else { 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(); return !getTypeForDeclaration(declaration).isError();