From 0031a633a254be885a1c48f3aa395bdf18374e7b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 25 Jan 2013 17:40:41 +0400 Subject: [PATCH] KT-3277 Exception opening URLClassloader from java SDK. Obviously static class initializer doesn't have a name EA-43194 - assert: KotlinSignatureInJavaMarkerProvider.getDescriptorForMember #KT-3277 fixed --- .../ktSignature/KotlinSignatureInJavaMarkerProvider.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java index b6f13e7e6a1..f5eea8e8624 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -159,6 +159,10 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { @NotNull JetScope memberScope, @NotNull BindingContext bindingContext ) { + if (!(member instanceof PsiMethod) && !(member instanceof PsiField)) { + return null; + } + String memberNameAsString = member.getName(); assert memberNameAsString != null: "No name for member: \n" + member.getText(); @@ -172,11 +176,8 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { memberScope.getFunctions(name); } } - else if (member instanceof PsiField) { - memberScope.getProperties(name); - } else { - return null; + memberScope.getProperties(name); } PsiModifierListOwner annotationOwner = getAnnotationOwner(member);