Drop package facades:
- update incremental compilation tests
This commit is contained in:
@@ -67,10 +67,10 @@ fun ClassDescriptor.getParentJavaStaticClassScope(): LazyJavaStaticClassScope? {
|
||||
return staticScope
|
||||
}
|
||||
|
||||
fun DeserializedCallableMemberDescriptor.getImplClassName(): Name? =
|
||||
getImplClassName(this.proto, this.nameResolver)
|
||||
fun DeserializedCallableMemberDescriptor.getImplClassNameForDeserialized(): Name? =
|
||||
getImplClassNameForProto(this.proto, this.nameResolver)
|
||||
|
||||
fun getImplClassName(proto: MessageLite, nameResolver: NameResolver): Name? =
|
||||
fun getImplClassNameForProto(proto: MessageLite, nameResolver: NameResolver): Name? =
|
||||
when (proto) {
|
||||
is ProtoBuf.Constructor ->
|
||||
null
|
||||
|
||||
+3
-2
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.load.kotlin
|
||||
|
||||
import org.jetbrains.kotlin.descriptors.SourceElement
|
||||
import org.jetbrains.kotlin.descriptors.SourceFile
|
||||
import org.jetbrains.kotlin.load.java.descriptors.getImplClassName
|
||||
import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForDeserialized
|
||||
import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForProto
|
||||
import org.jetbrains.kotlin.load.java.structure.JavaPackage
|
||||
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
|
||||
|
||||
@@ -43,7 +44,7 @@ class KotlinJvmBinaryPackageSourceElement(
|
||||
}
|
||||
|
||||
public fun getContainingBinaryClass(descriptor: DeserializedCallableMemberDescriptor): KotlinJvmBinaryClass? {
|
||||
val name = descriptor.getImplClassName() ?: return null
|
||||
val name = descriptor.getImplClassNameForDeserialized() ?: return null
|
||||
return implClassNameToBinaryClass[name.asString()]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user