Extract AnnotationLoader from AnnotationAndConstantLoader, so it can be used without FE1.0

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java

@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2015 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;
-
-public enum AnnotatedCallableKind {
-    FUNCTION,
-    PROPERTY,
-    PROPERTY_GETTER,
-    PROPERTY_SETTER
-}

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

@@ -17,62 +17,9 @@
 package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.types.KotlinType
 
-// The MessageLite instance everywhere should be Constructor, Function or Property
-// TODO: simplify this interface
-interface AnnotationAndConstantLoader<out A : Any, out C : Any> {
-    fun loadClassAnnotations(
-        container: ProtoContainer.Class
-    ): List<A>
-
-    fun loadCallableAnnotations(
-        container: ProtoContainer,
-        proto: MessageLite,
-        kind: AnnotatedCallableKind
-    ): List<A>
-
-    fun loadPropertyBackingFieldAnnotations(
-        container: ProtoContainer,
-        proto: ProtoBuf.Property
-    ): List<A>
-
-    fun loadPropertyDelegateFieldAnnotations(
-        container: ProtoContainer,
-        proto: ProtoBuf.Property
-    ): List<A>
-
-    fun loadEnumEntryAnnotations(
-        container: ProtoContainer,
-        proto: ProtoBuf.EnumEntry
-    ): List<A>
-
-    fun loadValueParameterAnnotations(
-        container: ProtoContainer,
-        callableProto: MessageLite,
-        kind: AnnotatedCallableKind,
-        parameterIndex: Int,
-        proto: ProtoBuf.ValueParameter
-    ): List<A>
-
-    fun loadExtensionReceiverParameterAnnotations(
-        container: ProtoContainer,
-        proto: MessageLite,
-        kind: AnnotatedCallableKind
-    ): List<A>
-
-    fun loadTypeAnnotations(
-        proto: ProtoBuf.Type,
-        nameResolver: NameResolver
-    ): List<A>
-
-    fun loadTypeParameterAnnotations(
-        proto: ProtoBuf.TypeParameter,
-        nameResolver: NameResolver
-    ): List<A>
-
+interface AnnotationAndConstantLoader<out A : Any, out C : Any> : AnnotationLoader<A> {
     fun loadPropertyConstant(
         container: ProtoContainer,
         proto: ProtoBuf.Property,

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

@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2015 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.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-
-sealed class ProtoContainer(
-    val nameResolver: NameResolver,
-    val typeTable: TypeTable,
-    val source: SourceElement?
-) {
-    class Class(
-        val classProto: ProtoBuf.Class,
-        nameResolver: NameResolver,
-        typeTable: TypeTable,
-        source: SourceElement?,
-        val outerClass: ProtoContainer.Class?
-    ) : ProtoContainer(nameResolver, typeTable, source) {
-        val classId: ClassId = nameResolver.getClassId(classProto.fqName)
-
-        val kind: ProtoBuf.Class.Kind = Flags.CLASS_KIND.get(classProto.flags) ?: ProtoBuf.Class.Kind.CLASS
-        val isInner: Boolean = Flags.IS_INNER.get(classProto.flags)
-
-        override fun debugFqName(): FqName = classId.asSingleFqName()
-    }
-
-    class Package(
-        val fqName: FqName,
-        nameResolver: NameResolver,
-        typeTable: TypeTable,
-        source: SourceElement?
-    ) : ProtoContainer(nameResolver, typeTable, source) {
-        override fun debugFqName(): FqName = fqName
-    }
-
-    abstract fun debugFqName(): FqName
-
-    override fun toString() = "${this::class.java.simpleName}: ${debugFqName()}"
-}