Extract common parts from deserialization of built-ins and JS

2017-02-01 11:18:01 +03:00
parent 3cb8f1ab20
commit 5a00a97cf1
10 changed files with 69 additions and 100 deletions
@@ -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 } }
+            )
+}
@@ -0,0 +1,40 @@
+/*
+ * 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.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
+
+class ProtoBasedClassDataFinder(
+        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)
+    }
+}