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 {