java.lang.Object is not required class
#KT-1609 Fixed
This commit is contained in:
+4
-11
@@ -528,19 +528,12 @@ public class JavaDescriptorResolver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// cache
|
private static final FqName JL_OBJECT = new FqName("java.lang.Object");
|
||||||
protected ClassDescriptor javaLangObject;
|
|
||||||
|
|
||||||
@NotNull
|
|
||||||
private ClassDescriptor getJavaLangObject() {
|
|
||||||
if (javaLangObject == null) {
|
|
||||||
javaLangObject = resolveClass(new FqName("java.lang.Object"), DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN);
|
|
||||||
}
|
|
||||||
return javaLangObject;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isJavaLangObject(JetType type) {
|
private boolean isJavaLangObject(JetType type) {
|
||||||
return type.getConstructor().getDeclarationDescriptor() == getJavaLangObject();
|
ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
|
||||||
|
return classifierDescriptor instanceof ClassDescriptor &&
|
||||||
|
DescriptorUtils.getFQName(classifierDescriptor).equals(JL_OBJECT.toUnsafe());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user