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

Fix terminology: internal name instead of FQ name

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-18 21:52:08 +03:00
parent 2ccd6d54b7
commit 6048ebf871
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class CompilerCallbackServicesFacadeServer(
override fun incrementalCache_getMultifileFacade(target: TargetId, partInternalName: String): String? = incrementalCompilationComponents!!.getIncrementalCache(target).getMultifileFacade(partInternalName) 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() override fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? = incrementalCompilationComponents!!.getIncrementalCache(target).getModuleMappingData()
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
+1 -1
View File
@@ -52,7 +52,7 @@ interface CompilerCallbackServicesFacade : Remote {
fun incrementalCache_getMultifileFacade(target: TargetId, partInternalName: String): String? fun incrementalCache_getMultifileFacade(target: TargetId, partInternalName: String): String?
@Throws(RemoteException::class) @Throws(RemoteException::class)
fun incrementalCache_getPackagePartData(target: TargetId, fqName: String): JvmPackagePartProto? fun incrementalCache_getPackagePartData(target: TargetId, partInternalName: String): JvmPackagePartProto?
@Throws(RemoteException::class) @Throws(RemoteException::class)
fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray? fun incrementalCache_getModuleMappingData(target: TargetId): ByteArray?
compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt
+4 -4
View File
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.daemon 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.CompilerCallbackServicesFacade
import org.jetbrains.kotlin.daemon.common.DummyProfiler import org.jetbrains.kotlin.daemon.common.DummyProfiler
import org.jetbrains.kotlin.daemon.common.Profiler 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 { 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<String>? = profiler.withMeasure(this) { facade.incrementalCache_getMultifileFacadeParts(target, facadeInternalName) } override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection<String>? = 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) } override fun getMultifileFacade(partInternalName: String): String? = profiler.withMeasure(this) { facade.incrementalCache_getMultifileFacade(target, partInternalName) }
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+2 -2
View File
@@ -111,8 +111,8 @@ public class IncrementalPackageFragmentProvider(
it.parts it.parts
} }
else { else {
val packageFqName = it.packageFqName.replace('.', '/') val internalNamePrefix = it.packageFqName.replace('.', '/') + "/"
it.parts.map { packageFqName + "/" + it } it.parts.map { internalNamePrefix + it }
} }
allParts.filterNot { it in obsoletePackageParts } allParts.filterNot { it in obsoletePackageParts }
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCache.kt
+1 -1
View File
@@ -29,7 +29,7 @@ public interface IncrementalCache {
public fun getMultifileFacade(partInternalName: String): String? public fun getMultifileFacade(partInternalName: String): String?
public fun getPackagePartData(fqName: String): JvmPackagePartProto? public fun getPackagePartData(partInternalName: String): JvmPackagePartProto?
public fun getModuleMappingData(): ByteArray? public fun getModuleMappingData(): ByteArray?
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+2 -2
View File
@@ -296,8 +296,8 @@ public class IncrementalCacheImpl(
return obsoletePackageParts return obsoletePackageParts
} }
override fun getPackagePartData(fqName: String): JvmPackagePartProto? { override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? {
return protoMap[JvmClassName.byInternalName(fqName)]?.let { value -> return protoMap[JvmClassName.byInternalName(partInternalName)]?.let { value ->
JvmPackagePartProto(value.bytes, value.strings) JvmPackagePartProto(value.bytes, value.strings)
} }
} }