azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackagePartProvider refactoring

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-01 15:09:10 +03:00
parent 5ca8f7409a
commit 672d25e7e0
33 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.load.java.lazy
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageFacadeProvider
import org.jetbrains.kotlin.descriptors.PackagePartProvider
import org.jetbrains.kotlin.load.java.JavaClassFinder
import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver
import org.jetbrains.kotlin.load.java.components.ExternalSignatureResolver
@@ -47,7 +47,7 @@ class JavaResolverComponents(
val samConversionResolver: SamConversionResolver,
val sourceElementFactory: JavaSourceElementFactory,
val moduleClassResolver: ModuleClassResolver,
val packageMapper: PackageFacadeProvider
val packageMapper: PackagePartProvider
)
open class LazyJavaResolverContext(
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
+1 -1
View File
@@ -49,7 +49,7 @@ public class LazyJavaPackageScope(
= c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName))
public val kotlinBinaryClasses: List<KotlinJvmBinaryClass> by lazy {
val files = c.components.packageMapper.findPackageFacades(jPackage.getFqName().asString().replace('.', '/'))
val files = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString().replace('.', '/'))
val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName
files.map {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+6 -6
View File
@@ -20,19 +20,19 @@ import java.io.Writer
public class ModuleMapping(val moduleMapping: String) {
val package2MiniFacades = hashMapOf<String, PackageFacades>()
val package2Parts = hashMapOf<String, PackageParts>()
init {
for (i in moduleMapping.split("\n")) {
if(i.isEmpty()) continue
val (pakage, facade) = i.split("->")
val miniFacades = package2MiniFacades.getOrPut(pakage, { PackageFacades(pakage) })
val miniFacades = package2Parts.getOrPut(pakage, { PackageParts(pakage) })
miniFacades.parts.add(facade)
}
}
fun findPackageParts(internalPackageName: String): PackageFacades? {
return package2MiniFacades[internalPackageName]
fun findPackageParts(internalPackageName: String): PackageParts? {
return package2Parts[internalPackageName]
}
companion object {
@@ -40,7 +40,7 @@ public class ModuleMapping(val moduleMapping: String) {
}
}
public class PackageFacades(val packageInternalName: String) {
public class PackageParts(val packageInternalName: String) {
val parts = linkedSetOf<String>()
@@ -51,7 +51,7 @@ public class PackageFacades(val packageInternalName: String) {
}
override fun equals(other: Any?): Boolean {
if (other !is PackageFacades) {
if (other !is PackageParts) {
return false;
}