From 6048ebf871b8e4f72e4d9582d94e8a2a78dfadee Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 18 Dec 2015 21:52:08 +0300 Subject: [PATCH] Fix terminology: internal name instead of FQ name --- .../daemon/client/CompilerCallbackServicesFacadeServer.kt | 2 +- .../daemon/common/CompilerCallbackServicesFacade.kt | 2 +- .../kotlin/daemon/RemoteIncrementalCacheClient.kt | 8 ++++---- .../incremental/IncrementalPackageFragmentProvider.kt | 4 ++-- .../kotlin/incremental/components/IncrementalCache.kt | 2 +- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt index 60e4c5c5a0c..7f1cf121923 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt @@ -53,7 +53,7 @@ class CompilerCallbackServicesFacadeServer( override fun incrementalCache_getMultifileFacade(target: TargetId, partInternalName: String): String? = incrementalCompilationComponents!!.getIncrementalCache(target).getMultifileFacade(partInternalName) - override fun incrementalCache_getPackagePartData(target: TargetId, fqName: String): JvmPackagePartProto? = incrementalCompilationComponents!!.getIncrementalCache(target).getPackagePartData(fqName) + override fun incrementalCache_getPackagePartData(target: TargetId, partInternalName: String): JvmPackagePartProto? = incrementalCompilationComponents!!.getIncrementalCache(target).getPackagePartData(partInternalName) override fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? = incrementalCompilationComponents!!.getIncrementalCache(target).getModuleMappingData() diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt index e5df09a4302..6b6859ffb93 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt @@ -52,7 +52,7 @@ interface CompilerCallbackServicesFacade : Remote { fun incrementalCache_getMultifileFacade(target: TargetId, partInternalName: String): String? @Throws(RemoteException::class) - fun incrementalCache_getPackagePartData(target: TargetId, fqName: String): JvmPackagePartProto? + fun incrementalCache_getPackagePartData(target: TargetId, partInternalName: String): JvmPackagePartProto? @Throws(RemoteException::class) fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt index dec93c891e5..32294631a15 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.daemon -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade import org.jetbrains.kotlin.daemon.common.DummyProfiler import org.jetbrains.kotlin.daemon.common.Profiler +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto +import org.jetbrains.kotlin.modules.TargetId class RemoteIncrementalCacheClient(val facade: CompilerCallbackServicesFacade, val target: TargetId, val profiler: Profiler = DummyProfiler()): IncrementalCache { @@ -31,7 +31,7 @@ class RemoteIncrementalCacheClient(val facade: CompilerCallbackServicesFacade, v override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection? = profiler.withMeasure(this) { facade.incrementalCache_getMultifileFacadeParts(target, facadeInternalName) } - override fun getPackagePartData(fqName: String): JvmPackagePartProto? = profiler.withMeasure(this) { facade.incrementalCache_getPackagePartData(target, fqName) } + override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? = profiler.withMeasure(this) { facade.incrementalCache_getPackagePartData(target, partInternalName) } override fun getMultifileFacade(partInternalName: String): String? = profiler.withMeasure(this) { facade.incrementalCache_getMultifileFacade(target, partInternalName) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index 8c2819af776..f906e783c3d 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -111,8 +111,8 @@ public class IncrementalPackageFragmentProvider( it.parts } else { - val packageFqName = it.packageFqName.replace('.', '/') - it.parts.map { packageFqName + "/" + it } + val internalNamePrefix = it.packageFqName.replace('.', '/') + "/" + it.parts.map { internalNamePrefix + it } } allParts.filterNot { it in obsoletePackageParts } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt index 26720db5d8c..205d2a33ed7 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt @@ -29,7 +29,7 @@ public interface IncrementalCache { public fun getMultifileFacade(partInternalName: String): String? - public fun getPackagePartData(fqName: String): JvmPackagePartProto? + public fun getPackagePartData(partInternalName: String): JvmPackagePartProto? public fun getModuleMappingData(): ByteArray? diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index bbbaf1514c6..653f7494278 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -296,8 +296,8 @@ public class IncrementalCacheImpl( return obsoletePackageParts } - override fun getPackagePartData(fqName: String): JvmPackagePartProto? { - return protoMap[JvmClassName.byInternalName(fqName)]?.let { value -> + override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? { + return protoMap[JvmClassName.byInternalName(partInternalName)]?.let { value -> JvmPackagePartProto(value.bytes, value.strings) } }