Extract common parts from deserialization of built-ins and JS

core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt

@@ -19,10 +19,7 @@ package org.jetbrains.kotlin.builtins
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragment
-import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
 
@@ -31,31 +28,17 @@ class BuiltInsPackageFragment(
         storageManager: StorageManager,
         module: ModuleDescriptor,
         inputStream: InputStream
-) : DeserializedPackageFragment(fqName, storageManager, module) {
-    private val proto = inputStream.use { stream ->
-        val version = BuiltInsBinaryVersion.readFrom(stream)
+) : DeserializedPackageFragmentImpl(fqName, storageManager, module, inputStream.use { stream ->
+    val version = BuiltInsBinaryVersion.readFrom(stream)
 
-        if (!version.isCompatible()) {
-            // TODO: report a proper diagnostic
-            throw UnsupportedOperationException(
-                    "Kotlin built-in definition format version is not supported: " +
-                    "expected ${BuiltInsBinaryVersion.INSTANCE}, actual $version. " +
-                    "Please update Kotlin"
-            )
-        }
-
-        ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry)
+    if (!version.isCompatible()) {
+        // TODO: report a proper diagnostic
+        throw UnsupportedOperationException(
+                "Kotlin built-in definition format version is not supported: " +
+                "expected ${BuiltInsBinaryVersion.INSTANCE}, actual $version. " +
+                "Please update Kotlin"
+        )
     }
 
-    private val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
-
-    override val classDataFinder = BuiltInsClassDataFinder(proto, nameResolver)
-
-    override fun computeMemberScope() =
-            DeserializedPackageMemberScope(
-                    this, proto.`package`, nameResolver, containerSource = null, components = components,
-                    classNames = { classDataFinder.allClassIds.filter { classId ->
-                        !classId.isNestedClass && classId !in ClassDeserializer.BLACK_LIST
-                    }.map { it.shortClassName } }
-            )
-}
+    ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry)
+})

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2017 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.kotlin.serialization.deserialization
+
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.storage.StorageManager
+
+abstract class DeserializedPackageFragmentImpl(
+        fqName: FqName,
+        storageManager: StorageManager,
+        module: ModuleDescriptor,
+        protected val proto: ProtoBuf.PackageFragment
+) : DeserializedPackageFragment(fqName, storageManager, module) {
+    protected val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
+
+    override val classDataFinder = ProtoBasedClassDataFinder(proto, nameResolver)
+
+    override fun computeMemberScope() =
+            DeserializedPackageMemberScope(
+                    this, proto.`package`, nameResolver, containerSource = null, components = components,
+                    classNames = { classDataFinder.allClassIds.filter { classId ->
+                        !classId.isNestedClass && classId !in ClassDeserializer.BLACK_LIST
+                    }.map { it.shortClassName } }
+            )
+}

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt

@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.builtins
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.ClassDataWithSource
 import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
-class BuiltInsClassDataFinder(
+class ProtoBasedClassDataFinder(
         proto: ProtoBuf.PackageFragment,
         private val nameResolver: NameResolver
 ) : ClassDataFinder {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.builtIns
 
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol
-import org.jetbrains.kotlin.builtins.BuiltInsClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -46,7 +46,7 @@ class KotlinBuiltInDeserializerForDecompiler(
         val notFoundClasses = NotFoundClasses(storageManager, moduleDescriptor)
 
         deserializationComponents = DeserializationComponents(
-                storageManager, moduleDescriptor, DeserializationConfiguration.Default, BuiltInsClassDataFinder(proto, nameResolver),
+                storageManager, moduleDescriptor, DeserializationConfiguration.Default, ProtoBasedClassDataFinder(proto, nameResolver),
                 AnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, BuiltInSerializerProtocol), packageFragmentProvider,
                 ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), LoggingErrorReporter(LOG),
                 LookupTracker.DO_NOTHING, FlexibleTypeDeserializer.ThrowException, emptyList(), notFoundClasses

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInStubBuilder.kt

@@ -21,7 +21,7 @@ import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.util.indexing.FileContent
 import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol
-import org.jetbrains.kotlin.builtins.BuiltInsClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
 import org.jetbrains.kotlin.idea.decompiler.common.AnnotationLoaderForStubBuilderImpl
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.*
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
@@ -45,7 +45,7 @@ class KotlinBuiltInStubBuilder : ClsStubBuilder() {
                 val packageFqName = file.packageFqName
                 val nameResolver = file.nameResolver
                 val components = ClsStubBuilderComponents(
-                        BuiltInsClassDataFinder(file.proto, nameResolver),
+                        ProtoBasedClassDataFinder(file.proto, nameResolver),
                         AnnotationLoaderForStubBuilderImpl(BuiltInSerializerProtocol),
                         virtualFile
                 )

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptDeserializerForDecompiler.kt

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.decompiler.js
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompilerBase
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
@@ -32,7 +33,6 @@ import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
-import org.jetbrains.kotlin.serialization.js.KotlinJavascriptClassDataFinder
 
 // TODO: deduplicate with KotlinBuiltInDeserializerForDecompiler
 class KotlinJavaScriptDeserializerForDecompiler(
@@ -49,7 +49,7 @@ class KotlinJavaScriptDeserializerForDecompiler(
         val notFoundClasses = NotFoundClasses(storageManager, moduleDescriptor)
 
         deserializationComponents = DeserializationComponents(
-                storageManager, moduleDescriptor, DeserializationConfiguration.Default, KotlinJavascriptClassDataFinder(proto, nameResolver),
+                storageManager, moduleDescriptor, DeserializationConfiguration.Default, ProtoBasedClassDataFinder(proto, nameResolver),
                 AnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, JsSerializerProtocol), packageFragmentProvider,
                 ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), LoggingErrorReporter(LOG),
                 LookupTracker.DO_NOTHING, DynamicTypeDeserializer, emptyList(), notFoundClasses

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptStubBuilder.kt

@@ -20,13 +20,13 @@ import com.intellij.psi.compiled.ClsStubBuilder
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.util.indexing.FileContent
+import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
 import org.jetbrains.kotlin.idea.decompiler.common.AnnotationLoaderForStubBuilderImpl
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.*
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
-import org.jetbrains.kotlin.serialization.js.KotlinJavascriptClassDataFinder
 
 // TODO: deduplicate code with KotlinBuiltInStubBuilder
 class KotlinJavaScriptStubBuilder : ClsStubBuilder() {
@@ -46,7 +46,7 @@ class KotlinJavaScriptStubBuilder : ClsStubBuilder() {
                 val packageFqName = file.packageFqName
                 val nameResolver = file.nameResolver
                 val components = ClsStubBuilderComponents(
-                        KotlinJavascriptClassDataFinder(file.proto, nameResolver),
+                        ProtoBasedClassDataFinder(file.proto, nameResolver),
                         AnnotationLoaderForStubBuilderImpl(JsSerializerProtocol),
                         virtualFile
                 )

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptClassDataFinder.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2016 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.kotlin.serialization.js
-
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.ClassData
-import org.jetbrains.kotlin.serialization.ClassDataWithSource
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-
-class KotlinJavascriptClassDataFinder(
-        proto: ProtoBuf.PackageFragment,
-        private val nameResolver: NameResolver
-) : ClassDataFinder {
-    private val classIdToProto =
-            proto.class_List.associateBy { klass ->
-                nameResolver.getClassId(klass.fqName)
-            }
-
-    internal val allClassIds: Collection<ClassId> get() = classIdToProto.keys
-
-    override fun findClassData(classId: ClassId): ClassDataWithSource? {
-        val classProto = classIdToProto[classId] ?: return null
-        return ClassDataWithSource(ClassData(nameResolver, classProto), SourceElement.NO_SOURCE)
-    }
-}

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt

@@ -20,15 +20,12 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.AnnotationDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragment
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.storage.StorageManager
@@ -38,11 +35,10 @@ class KotlinJavascriptPackageFragment(
         fqName: FqName,
         storageManager: StorageManager,
         module: ModuleDescriptor,
-        private val proto: ProtoBuf.PackageFragment,
-        private val nameResolver: NameResolver
-) : DeserializedPackageFragment(fqName, storageManager, module) {
+        proto: ProtoBuf.PackageFragment
+) : DeserializedPackageFragmentImpl(fqName, storageManager, module, proto) {
     private val fileMap: Map<Int, FileHolder> by storageManager.createLazyValue {
-        proto.getExtension(JsProtoBuf.packageFragmentFiles).fileList.withIndex().associate { (index, file) ->
+        this.proto.getExtension(JsProtoBuf.packageFragmentFiles).fileList.withIndex().associate { (index, file) ->
             (if (file.hasId()) file.id else index) to FileHolder(file.annotationList)
         }
     }
@@ -51,14 +47,6 @@ class KotlinJavascriptPackageFragment(
         AnnotationDeserializer(module, components.notFoundClasses)
     }
 
-    override val classDataFinder = KotlinJavascriptClassDataFinder(proto, nameResolver)
-
-    override fun computeMemberScope(): DeserializedPackageMemberScope =
-            DeserializedPackageMemberScope(
-                    this, proto.`package`, nameResolver, containerSource = null, components = components,
-                    classNames = { classDataFinder.allClassIds.filterNot(ClassId::isNestedClass).map { it.shortClassName } }
-            )
-
     fun getContainingFileAnnotations(descriptor: DeclarationDescriptor): List<AnnotationDescriptor> {
         if (DescriptorUtils.getParentOfType(descriptor, PackageFragmentDescriptor::class.java) != this) {
             throw IllegalArgumentException("Provided descriptor $descriptor does not belong to this package $this")

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt

@@ -37,7 +37,7 @@ fun createKotlinJavascriptPackageFragmentProvider(
             proto.class_Count > 0 -> nameResolver.getClassId(proto.class_OrBuilderList.first().fqName).packageFqName
             else -> throw IllegalStateException("Invalid library part: either a Package or a Class must be present")
         }
-        KotlinJavascriptPackageFragment(fqName, storageManager, module, proto, nameResolver)
+        KotlinJavascriptPackageFragment(fqName, storageManager, module, proto)
     }
 
     val provider = PackageFragmentProviderImpl(packageFragments)