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

Got rid of harmful asserts.

Browse Source 
EA-43300 - assert: KotlinSignatureInJavaMarkerProvider.getScopeForMember
EA-43353 - assert: KotlinSignatureInJavaMarkerProvider.getDescriptorForMember
This commit is contained in:
Evgeny Gerashchenko
2013-02-07 23:10:27 +04:00
parent 6b23384ab9
commit 814cb6e255
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+11 -7
View File
@@ -130,10 +130,13 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
FqName classFqName = new FqName(qualifiedName); FqName classFqName = new FqName(qualifiedName);
JetScope memberScope = getScopeForMember(javaDescriptorResolver, classFqName, member); JetScope memberScope = getScopeForMember(javaDescriptorResolver, classFqName, member);
if (memberScope == null) {
return null;
}
return getDescriptorForMember(member, memberScope, bindingContext); return getDescriptorForMember(member, memberScope, bindingContext);
} }
@NotNull @Nullable
private static JetScope getScopeForMember( private static JetScope getScopeForMember(
@NotNull JavaDescriptorResolver javaDescriptorResolver, @NotNull JavaDescriptorResolver javaDescriptorResolver,
@NotNull FqName classFqName, @NotNull FqName classFqName,
@@ -141,13 +144,17 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
) { ) {
if (member.hasModifierProperty(PsiModifier.STATIC)) { if (member.hasModifierProperty(PsiModifier.STATIC)) {
NamespaceDescriptor packageDescriptor = javaDescriptorResolver.resolveNamespace(classFqName); NamespaceDescriptor packageDescriptor = javaDescriptorResolver.resolveNamespace(classFqName);
assert packageDescriptor != null : "No package descriptor for Java class " + classFqName + " that has a static member " + member; if (packageDescriptor == null) {
return null;
}
return packageDescriptor.getMemberScope(); return packageDescriptor.getMemberScope();
} }
else { else {
ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName); ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName);
assert klass != null : " Couldn't find class " + classFqName; if (klass == null) {
return null;
}
return klass.getDefaultType().getMemberScope(); return klass.getDefaultType().getMemberScope();
} }
@@ -181,10 +188,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
} }
PsiModifierListOwner annotationOwner = getAnnotationOwner(member); PsiModifierListOwner annotationOwner = getAnnotationOwner(member);
DeclarationDescriptor memberDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotationOwner); return bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotationOwner);
LOG.assertTrue(memberDescriptor != null, "Couldn't find descriptor for " + annotationOwner + "\n"
+ annotationOwner.getContainingFile().getText());
return memberDescriptor;
} }
public static boolean isMarkersEnabled(@NotNull Project project) { public static boolean isMarkersEnabled(@NotNull Project project) {