Rewritten PackageFragmentDescriptor to Kotlin.
This commit is contained in:
@@ -52,7 +52,7 @@ public object ClassSerializationUtil {
|
||||
public fun getClassId(classDescriptor: ClassDescriptor): ClassId {
|
||||
val owner = classDescriptor.getContainingDeclaration()
|
||||
if (owner is PackageFragmentDescriptor) {
|
||||
return ClassId(owner.getFqName(), FqNameUnsafe.topLevel(classDescriptor.getName()))
|
||||
return ClassId(owner.fqName, FqNameUnsafe.topLevel(classDescriptor.getName()))
|
||||
}
|
||||
return getClassId(owner as ClassDescriptor).createNestedClassId(classDescriptor.getName())
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ public class CliSourcesMemberFilter(environment: JetCoreEnvironment): MemberFilt
|
||||
override fun acceptPackagePartClass(container: PackageFragmentDescriptor, member: ProtoBuf.Callable, nameResolver: NameResolver): Boolean {
|
||||
if (member.hasExtension(JavaProtoBuf.implClassName)) {
|
||||
val shortName = nameResolver.getName(member.getExtension(JavaProtoBuf.implClassName)!!)
|
||||
val fqName = container.getFqName().child(shortName)
|
||||
val fqName = container.fqName.child(shortName)
|
||||
val internalName = JvmClassName.byFqNameWithoutInnerClasses(fqName).getInternalName()
|
||||
return internalName !in packagePartClassNames
|
||||
}
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public class LazyResolveBasedCache() : JavaResolverCache {
|
||||
return resolveSession.findInPackageFragments(fqName) { packageFragmentDescriptor ->
|
||||
ResolveSessionUtils.findByQualifiedName(
|
||||
packageFragmentDescriptor.getMemberScope(),
|
||||
fqName.tail(packageFragmentDescriptor.getFqName()))
|
||||
fqName.tail(packageFragmentDescriptor.fqName))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user