Serialize FQ names of Kotlin classes
This helps to avoid a nasty hack with loading inner Kotlin classes in JDR, which makes it a bit easier to 'lazify' JDR, since now the container of a Kotlin class is no longer required to be resolved eagerly before resolution of the class itself
This commit is contained in:
+1
-1
@@ -120,7 +120,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
|
||||
ProtoBuf.Class classProto = ProtoBuf.Class.parseFrom(stream);
|
||||
|
||||
Name expectedShortName = classId.getRelativeClassName().shortName();
|
||||
Name actualShortName = nameResolver.getName(classProto.getName());
|
||||
Name actualShortName = nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName();
|
||||
if (!actualShortName.isSpecial() && !actualShortName.equals(expectedShortName)) {
|
||||
// Workaround for case-insensitive file systems,
|
||||
// otherwise we'd find "Collection" for "collection" etc
|
||||
|
||||
Reference in New Issue
Block a user