Move util method from JavaDescriptorResolver to DescriptorResolverUtils
This commit is contained in:
+6
@@ -120,4 +120,10 @@ public final class DescriptorResolverUtils {
|
|||||||
scopeData.setNamedMembersMap(JavaDescriptorResolverHelper.getNamedMembers(scopeData));
|
scopeData.setNamedMembersMap(JavaDescriptorResolverHelper.getNamedMembers(scopeData));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void checkPsiClassIsNotJet(PsiClass psiClass) {
|
||||||
|
if (psiClass instanceof JetJavaMirrorMarker) {
|
||||||
|
throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass: " + psiClass.getQualifiedName());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ public class JavaDescriptorResolveData {
|
|||||||
boolean staticMembers,
|
boolean staticMembers,
|
||||||
@NotNull ClassOrNamespaceDescriptor descriptor
|
@NotNull ClassOrNamespaceDescriptor descriptor
|
||||||
) {
|
) {
|
||||||
JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass);
|
DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass);
|
||||||
|
|
||||||
this.psiClass = psiClass;
|
this.psiClass = psiClass;
|
||||||
this.psiPackage = psiPackage;
|
this.psiPackage = psiPackage;
|
||||||
|
|||||||
-7
@@ -197,13 +197,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
return namespaceDescriptorCacheByFqn;
|
return namespaceDescriptorCacheByFqn;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void checkPsiClassIsNotJet(PsiClass psiClass) {
|
|
||||||
if (psiClass instanceof JetJavaMirrorMarker) {
|
|
||||||
throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass: " + psiClass.getQualifiedName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName, @NotNull DescriptorSearchRule searchRule) {
|
public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName, @NotNull DescriptorSearchRule searchRule) {
|
||||||
return namespaceResolver.resolveNamespace(qualifiedName, searchRule);
|
return namespaceResolver.resolveNamespace(qualifiedName, searchRule);
|
||||||
|
|||||||
+2
-2
@@ -142,7 +142,7 @@ public class ClassResolver {
|
|||||||
throw new IllegalStateException(qualifiedName);
|
throw new IllegalStateException(qualifiedName);
|
||||||
}
|
}
|
||||||
|
|
||||||
JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass);
|
DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass);
|
||||||
|
|
||||||
Name name = Name.identifier(psiClass.getName());
|
Name name = Name.identifier(psiClass.getName());
|
||||||
JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass);
|
JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass);
|
||||||
@@ -212,7 +212,7 @@ public class ClassResolver {
|
|||||||
@NotNull ClassDescriptor containing,
|
@NotNull ClassDescriptor containing,
|
||||||
@NotNull PsiClass psiClass
|
@NotNull PsiClass psiClass
|
||||||
) {
|
) {
|
||||||
JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass);
|
DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass);
|
||||||
|
|
||||||
if (psiClass.isEnum()) {
|
if (psiClass.isEnum()) {
|
||||||
return createClassObjectDescriptorForEnum(containing, psiClass);
|
return createClassObjectDescriptorForEnum(containing, psiClass);
|
||||||
|
|||||||
Reference in New Issue
Block a user