Converted DeserializedPackageMemberScope to Kotlin

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -114,8 +114,11 @@ public class IncrementalPackageFragmentProvider(
         }
 
         private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope(
-                this@IncrementalPackageFragment, packageData, deserializationContext, { listOf() }
+                this@IncrementalPackageFragment,
-        ) {
+                packageData.getPackageProto(),
+                deserializationContext.withNameResolver(packageData.getNameResolver()),
+                { listOf() }) {
+
             override fun filteredMemberProtos(allMemberProtos: Collection<ProtoBuf.Callable>): Collection<ProtoBuf.Callable> {
                 return allMemberProtos
                         .filter {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java

@@ -20,7 +20,7 @@ import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope;
+import org.jetbrains.jet.descriptors.serialization.descriptors.DescriptorsPackage;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
@@ -64,7 +64,7 @@ public final class DeserializedDescriptorResolver {
         String[] data = readData(kotlinClass, PACKAGE_FACADE);
         if (data != null) {
             //all classes are included in java scope
-            return new DeserializedPackageMemberScope(descriptor, JavaProtoBufUtil.readPackageDataFrom(data), context,
+            return DescriptorsPackage.DeserializedPackageMemberScope(descriptor, JavaProtoBufUtil.readPackageDataFrom(data), context,
                                                       new Function0<Collection<Name>>() {
                 @Override
                 public Collection<Name> invoke() {

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java

@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.descriptors.serialization.descriptors;
-
-import kotlin.Function0;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.PackageData;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.context.ContextPackage;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
-import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
-import org.jetbrains.jet.lang.resolve.name.ClassId;
-import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.jet.storage.NotNullLazyValue;
-
-import java.util.Collection;
-
-public class DeserializedPackageMemberScope extends DeserializedMemberScope {
-
-    private final FqName packageFqName;
-    private final DeserializationContext context;
-    private final NotNullLazyValue<Collection<Name>> classNames;
-
-    public DeserializedPackageMemberScope(
-            @NotNull PackageFragmentDescriptor packageDescriptor,
-            @NotNull ProtoBuf.Package proto,
-            @NotNull DeserializationContext context,
-            @NotNull Function0<Collection<Name>> classNames
-    ) {
-        super(context.withTypes(packageDescriptor), proto.getMemberList());
-        this.context = context;
-        this.packageFqName = packageDescriptor.getFqName();
-        this.classNames = context.getStorageManager().createLazyValue(classNames);
-    }
-
-    public DeserializedPackageMemberScope(
-            @NotNull PackageFragmentDescriptor packageDescriptor,
-            @NotNull PackageData packageData,
-            @NotNull DeserializationGlobalContext context,
-            @NotNull Function0<Collection<Name>> classNames
-    ) {
-        this(packageDescriptor, packageData.getPackageProto(), context.withNameResolver(packageData.getNameResolver()), classNames);
-    }
-    @Nullable
-    @Override
-    protected ClassDescriptor getClassDescriptor(@NotNull Name name) {
-        return ContextPackage.deserializeClass(context, new ClassId(packageFqName, name));
-    }
-
-    @Override
-    protected void addAllClassDescriptors(@NotNull Collection<DeclarationDescriptor> result) {
-        for (Name className : classNames.invoke()) {
-            ClassDescriptor classDescriptor = getClassDescriptor(className);
-
-            if (classDescriptor != null) {
-                result.add(classDescriptor);
-            }
-        }
-    }
-
-    @Override
-    protected void addNonDeclaredDescriptors(@NotNull Collection<DeclarationDescriptor> result) {
-        // Do nothing
-    }
-
-    @Nullable
-    @Override
-    protected ReceiverParameterDescriptor getImplicitReceiver() {
-        return null;
-    }
-}

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.kt

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.descriptors.serialization.descriptors
+
+import org.jetbrains.jet.descriptors.serialization.PackageData
+import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.jet.descriptors.serialization.context.*
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
+import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
+import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor
+import org.jetbrains.jet.lang.resolve.name.ClassId
+import org.jetbrains.jet.lang.resolve.name.FqName
+import org.jetbrains.jet.lang.resolve.name.Name
+import org.jetbrains.jet.storage.NotNullLazyValue
+
+
+public fun DeserializedPackageMemberScope(packageDescriptor: PackageFragmentDescriptor,
+                                          packageData: PackageData,
+                                          context: DeserializationGlobalContext,
+                                          classNames: () -> Collection<Name>): DeserializedPackageMemberScope
+        = DeserializedPackageMemberScope(packageDescriptor, packageData.getPackageProto(), context.withNameResolver(packageData.getNameResolver()), classNames)
+
+public open class DeserializedPackageMemberScope(
+        packageDescriptor: PackageFragmentDescriptor,
+        proto: ProtoBuf.Package,
+        private val context: DeserializationContext,
+        classNames: () -> Collection<Name>)
+: DeserializedMemberScope(context.withTypes(packageDescriptor), proto.getMemberList()) {
+
+    private val packageFqName = packageDescriptor.fqName
+    private val classNames = context.storageManager.createLazyValue<Collection<Name>>(classNames)
+
+    override fun getClassDescriptor(name: Name) = context.deserializeClass(ClassId(packageFqName, name))
+
+    override fun addAllClassDescriptors(result: MutableCollection<DeclarationDescriptor>) {
+        for (className in classNames.invoke()) {
+            val classDescriptor = getClassDescriptor(className)
+
+            if (classDescriptor != null) {
+                result.add(classDescriptor)
+            }
+        }
+    }
+
+    override fun addNonDeclaredDescriptors(result: MutableCollection<DeclarationDescriptor>) {
+        // Do nothing
+    }
+
+    override fun getImplicitReceiver(): ReceiverParameterDescriptor? = null
+}