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

Convert PackageViewDescriptor to Kotlin

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-06-22 14:50:20 +03:00
parent 19cca8f930
commit 1cf38e4799
27 changed files with 55 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter
import org.jetbrains.kotlin.resolve.scopes.JetScope
class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : AbstractScopeAdapter() {
override val workerScope: JetScope = packageDescriptor.getMemberScope()
override val workerScope: JetScope = packageDescriptor.memberScope
override fun getPackage(name: Name): PackageViewDescriptor? = null
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+1 -1
View File
@@ -87,7 +87,7 @@ class QualifierReceiver (
fun getNestedClassesAndPackageMembersScope(): JetScope {
val scopes = ArrayList<JetScope>(4)
scopes.addIfNotNull(packageView?.getMemberScope())
scopes.addIfNotNull(packageView?.memberScope)
if (classifier is ClassDescriptor) {
scopes.add(classifier.getStaticScope())