From ddaebd2b27dba5859712c0a3a3153c4d990af0ab Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 21 Sep 2015 22:09:38 +0300 Subject: [PATCH] add isIncremental method to PackageFragmentDescriptorImpl in order to recognize descriptors from incremental package fragments during compilation --- .../kotlin/incremental/IncrementalPackageFragmentProvider.kt | 2 ++ .../kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt | 3 +++ 2 files changed, 5 insertions(+) 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 44c593f6100..6f5a18ae03f 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 @@ -134,6 +134,8 @@ public class IncrementalPackageFragmentProvider( override fun getMemberScope(): JetScope = memberScope() + override fun isIncremental(): Boolean = true + private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope( this@IncrementalPackageFragment, packageData.packageProto, packageData.nameResolver, deserializationComponents, { listOf() } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt index 1b9e5936b18..3d465a1fe56 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt @@ -40,4 +40,7 @@ public abstract class PackageFragmentDescriptorImpl( } override fun toString(): String = "package $fqName" + + @Deprecated("This is a hack in order to preliminary support internal visibility in multi-module projects") + open fun isIncremental(): Boolean = false }