Filter out package members from other facades in KPackageImpl

#KT-10690 Fixed
This commit is contained in:
Alexander Udalov
2016-02-20 17:19:39 +03:00
parent 1c0bbcd72b
commit 371051b1d6
5 changed files with 52 additions and 11 deletions
@@ -65,7 +65,6 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
}
class PackageParts(val packageFqName: String) {
val parts = linkedSetOf<String>()
override fun equals(other: Any?) =
@@ -74,15 +73,18 @@ class PackageParts(val packageFqName: String) {
override fun hashCode() =
packageFqName.hashCode() * 31 + parts.hashCode()
override fun toString() =
parts.toString()
companion object {
@JvmStatic fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
@JvmStatic
fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
if (this.parts.isNotEmpty()) {
val packageParts = JvmPackageTable.PackageParts.newBuilder()
packageParts.setPackageFqName(this.packageFqName)
packageParts.packageFqName = this.packageFqName
packageParts.addAllClassName(this.parts.sorted())
builder.addPackageParts(packageParts)
}
}
}
}