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

#fix KT-9881 Incorrect error re: internal visibility

Browse Source 
#KT-9881 Fixed
This commit is contained in:
Michael Nedzelsky
2015-11-08 03:11:25 +03:00
parent b468d5b0c6
commit a3241637ce
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt
+7 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment
import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider
import org.jetbrains.kotlin.modules.Module import org.jetbrains.kotlin.modules.Module
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import java.io.File import java.io.File
interface ModuleVisibilityManager { interface ModuleVisibilityManager {
@@ -53,7 +54,12 @@ public fun isContainedByCompiledPartOfOurModule(descriptor: DeclarationDescripto
is KotlinJvmBinarySourceElement -> is KotlinJvmBinarySourceElement ->
source.binaryClass source.binaryClass
is KotlinJvmBinaryPackageSourceElement -> is KotlinJvmBinaryPackageSourceElement ->
source.getRepresentativeBinaryClass() if (descriptor is DeserializedCallableMemberDescriptor) {
source.getContainingBinaryClass(descriptor) ?: source.getRepresentativeBinaryClass()
}
else {
source.getRepresentativeBinaryClass()
}
else -> else ->
null null
} }