Convert PackageViewDescriptor to Kotlin

compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt

@@ -115,7 +115,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
 
         val serializer = DescriptorSerializer.createTopLevel(BuiltInsSerializerExtension)
 
-        val classifierDescriptors = DescriptorSerializer.sort(packageView.getMemberScope().getDescriptors(DescriptorKindFilter.CLASSIFIERS))
+        val classifierDescriptors = DescriptorSerializer.sort(packageView.memberScope.getDescriptors(DescriptorKindFilter.CLASSIFIERS))
 
         serializeClasses(classifierDescriptors, serializer) {
             classDescriptor, classProto ->
@@ -125,7 +125,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
         }
 
         val packageStream = ByteArrayOutputStream()
-        val fragments = packageView.getFragments()
+        val fragments = packageView.fragments
         val packageProto = serializer.packageProto(fragments).build() ?: error("Package fragments not serialized: $fragments")
         packageProto.writeTo(packageStream)
         write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream,

compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt

@@ -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

@@ -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())

compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt

@@ -113,7 +113,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
     private fun checkClassInPackage(moduleDescriptor: ModuleDescriptor, packageName: String, className: String) {
         val kotlinPackage = moduleDescriptor.getPackage(FqName(packageName))!!
         val kotlinClassName = Name.identifier(className)
-        val kotlinClass = kotlinPackage.getMemberScope().getClassifier(kotlinClassName) as ClassDescriptor
+        val kotlinClass = kotlinPackage.memberScope.getClassifier(kotlinClassName) as ClassDescriptor
         checkClass(kotlinClass)
     }
 

compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt

@@ -145,7 +145,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
 
             if (header?.kind == KotlinClassHeader.Kind.PACKAGE_FACADE) {
                 val packageView = module.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME).sure { "Couldn't resolve package ${LoadDescriptorUtil.TEST_PACKAGE_FQNAME}" }
-                packageScopes.add(packageView.getMemberScope())
+                packageScopes.add(packageView.memberScope)
             }
             else if (header == null ||
                      (header.kind == KotlinClassHeader.Kind.CLASS && header.classKind == JvmAnnotationNames.KotlinClass.Kind.CLASS)) {
@@ -179,7 +179,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
         )
     }
 
-    private class SyntheticPackageViewForTest(private val module: ModuleDescriptor,
+    private class SyntheticPackageViewForTest(override val module: ModuleDescriptor,
                                               packageScopes: List<JetScope>,
                                               classes: List<ClassifierDescriptor>) : PackageViewDescriptor {
         private val scope: JetScope
@@ -191,9 +191,10 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
             scope = ChainedScope(this, "synthetic package view for test", writableScope, *packageScopes.toTypedArray())
         }
 
-        override fun getFqName() = LoadDescriptorUtil.TEST_PACKAGE_FQNAME
-        override fun getMemberScope() = scope
-        override fun getModule() = module
+        override val fqName: FqName
+            get() = LoadDescriptorUtil.TEST_PACKAGE_FQNAME
+        override val memberScope: JetScope
+            get() = scope
         override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R =
                 visitor.visitPackageViewDescriptor(this, data)
 
@@ -203,6 +204,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
         override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) = throw UnsupportedOperationException()
         override fun getAnnotations() = throw UnsupportedOperationException()
         override fun getName() = throw UnsupportedOperationException()
-        override fun getFragments() = throw UnsupportedOperationException()
+        override val fragments: Nothing
+            get() = throw UnsupportedOperationException()
     }
 }