Move util method from JavaDescriptorResolver to ClassResolver
This commit is contained in:
-11
@@ -178,7 +178,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
|
public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
|
||||||
|
|
||||||
return constructorResolver.resolveConstructors(classData);
|
return constructorResolver.resolveConstructors(classData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,16 +203,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
public static PsiClass getInnerClassClassObject(@NotNull PsiClass outer) {
|
|
||||||
for (PsiClass inner : outer.getInnerClasses()) {
|
|
||||||
if (inner.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
|
|
||||||
return inner;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean isJavaLangObject(JetType type) {
|
static boolean isJavaLangObject(JetType type) {
|
||||||
ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
|
ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
|
||||||
return classifierDescriptor instanceof ClassDescriptor &&
|
return classifierDescriptor instanceof ClassDescriptor &&
|
||||||
|
|||||||
+11
-1
@@ -229,7 +229,7 @@ public class ClassResolver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PsiClass classObjectPsiClass = JavaDescriptorResolver.getInnerClassClassObject(psiClass);
|
PsiClass classObjectPsiClass = getInnerClassClassObject(psiClass);
|
||||||
if (classObjectPsiClass == null) {
|
if (classObjectPsiClass == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -445,4 +445,14 @@ public class ClassResolver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public static PsiClass getInnerClassClassObject(@NotNull PsiClass outer) {
|
||||||
|
for (PsiClass inner : outer.getInnerClasses()) {
|
||||||
|
if (inner.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
|
||||||
|
return inner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user