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

class containigDeclaration cannot be null

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-17 16:03:31 +04:00
parent c23fca1cad
commit 5e8b0d39db
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+15 -3
View File
@@ -734,13 +734,25 @@ public class JavaDescriptorResolver {
return jetSignatureTypeParametersVisitor.r;
}
private ClassOrNamespaceDescriptor resolveParentDescriptor(PsiClass psiClass) {
@NotNull
private ClassOrNamespaceDescriptor resolveParentDescriptor(@NotNull PsiClass psiClass) {
FqName fqName = new FqName(psiClass.getQualifiedName());
PsiClass containingClass = psiClass.getContainingClass();
if (containingClass != null) {
return resolveClass(new FqName(containingClass.getQualifiedName()), DescriptorSearchRule.INCLUDE_KOTLIN);
FqName containerFqName = new FqName(containingClass.getQualifiedName());
ClassDescriptor clazz = resolveClass(containerFqName, DescriptorSearchRule.INCLUDE_KOTLIN);
if (clazz == null) {
throw new IllegalStateException("PsiClass not found by name " + containerFqName + ", required to be container declaration of " + fqName);
}
return clazz;
}
return resolveNamespace(new FqName(psiClass.getQualifiedName()).parent(), DescriptorSearchRule.INCLUDE_KOTLIN);
NamespaceDescriptor ns = resolveNamespace(fqName.parent(), DescriptorSearchRule.INCLUDE_KOTLIN);
if (ns == null) {
throw new IllegalStateException("cannot resolve namespace " + fqName.parent() + ", required to be container for " + fqName);
}
return ns;
}
private List<TypeParameterDescriptorInitialization> makeUninitializedTypeParameters(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter[] typeParameters) {