Removed MemberScope.getPackage

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -619,8 +619,5 @@ public class LazyJavaClassMemberScope(
         }
     }
 
-    // namespaces should be resolved elsewhere
-    override fun getPackage(name: Name) = null
-
     override fun toString() = "Lazy java member scope for " + jClass.getFqName()
 }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt

@@ -29,9 +29,6 @@ public abstract class LazyJavaStaticScope(c: LazyJavaResolverContext) : LazyJava
 
     override fun getDispatchReceiverParameter() = null
 
-    // Package fragments are not nested
-    override fun getPackage(name: Name) = null
-
     abstract fun getSubPackages(): Collection<FqName>
 
     override fun resolveMethodSignature(

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt

@@ -44,6 +44,7 @@ public class LazyPackageViewDescriptorImpl(
             MemberScope.Empty
         }
         else {
+            // Packages from SubpackagesScope are got via getContributedDescriptors(DescriptorKindFilter.PACKAGES, MemberScope.ALL_NAME_FILTER)
             val scopes = fragments.map { it.getMemberScope() } + SubpackagesScope(module, fqName)
             ChainedScope("package view scope for $fqName in ${module.getName()}", *scopes.toTypedArray())
         }

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt

@@ -28,9 +28,9 @@ import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.*
 
-public class SubpackagesScope(private val moduleDescriptor: ModuleDescriptor, private val fqName: FqName) : MemberScopeImpl() {
+public open class SubpackagesScope(private val moduleDescriptor: ModuleDescriptor, private val fqName: FqName) : MemberScopeImpl() {
 
-    override fun getPackage(name: Name): PackageViewDescriptor? {
+    protected fun getPackage(name: Name): PackageViewDescriptor? {
         if (name.isSpecial()) {
             return null
         }

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt

@@ -37,10 +37,6 @@ public abstract class AbstractScopeAdapter : MemberScope {
         return workerScope.getContributedFunctions(name, location)
     }
 
-    override fun getPackage(name: Name): PackageViewDescriptor? {
-        return workerScope.getPackage(name)
-    }
-
     override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? {
         return workerScope.getContributedClassifier(name, location)
     }

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt

@@ -32,9 +32,6 @@ public class ChainedScope(
     override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor?
             = getFirstMatch(scopeChain) { it.getContributedClassifier(name, location) }
 
-    override fun getPackage(name: Name): PackageViewDescriptor?
-            = getFirstMatch(scopeChain) { it.getPackage(name) }
-
     override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor>
             = getFromAllScopes(scopeChain) { it.getContributedVariables(name, location) }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt

@@ -27,9 +27,6 @@ public interface MemberScope : ResolutionScope {
 
     public override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor>
 
-    @Deprecated("Should be removed soon")
-    public fun getPackage(name: Name): PackageViewDescriptor?
-
     /**
      * Is supposed to be used in tests and debug only
      */

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScopeImpl.kt

@@ -26,8 +26,6 @@ abstract class MemberScopeImpl : MemberScope {
 
     override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> = emptyList()
 
-    override fun getPackage(name: Name): PackageViewDescriptor? = null
-
     override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor> = emptyList()
 
     override fun getContributedDescriptors(kindFilter: DescriptorKindFilter,

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt

@@ -65,8 +65,6 @@ public class SubstitutingScope(private val workerScope: MemberScope, private val
 
     override fun getContributedFunctions(name: Name, location: LookupLocation) = substitute(workerScope.getContributedFunctions(name, location))
 
-    override fun getPackage(name: Name) = workerScope.getPackage(name)
-
     override fun getContributedDescriptors(kindFilter: DescriptorKindFilter,
                                            nameFilter: (Name) -> Boolean) = _allDescriptors
 

core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java

@@ -180,11 +180,6 @@ public class ErrorUtils {
             return ERROR_PROPERTY_GROUP;
         }
 
-        @Override
-        public PackageViewDescriptor getPackage(@NotNull Name name) {
-            return null;
-        }
-
         @NotNull
         @Override
         public Set<FunctionDescriptor> getContributedFunctions(@NotNull Name name, @NotNull LookupLocation location) {
@@ -223,12 +218,6 @@ public class ErrorUtils {
             throw new IllegalStateException();
         }
 
-        @Nullable
-        @Override
-        public PackageViewDescriptor getPackage(@NotNull Name name) {
-            throw new IllegalStateException();
-        }
-
         @NotNull
         @Override
         @SuppressWarnings({"unchecked"}) // KT-9898 Impossible implement kotlin interface from java