Show "kotlin.Any" in decompiled text for local/anonymous types

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt

@@ -16,10 +16,11 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolverImpl
+import org.jetbrains.kotlin.storage.StorageManager
 
 // This class is needed only for easier injection: exact types of needed components are specified in the constructor here.
 // Otherwise injector generator is not smart enough to deduce, for example, which package fragment provider DeserializationComponents needs
@@ -30,8 +31,14 @@ public class DeserializationComponentsForJava(
         annotationAndConstantLoader: BinaryClassAnnotationAndConstantLoaderImpl,
         packageFragmentProvider: LazyJavaPackageFragmentProvider
 ) {
-    val components = DeserializationComponents(
-            storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider,
-            JavaFlexibleTypeCapabilitiesDeserializer
-    )
+    val components: DeserializationComponents;
+
+    {
+        val localClassResolver = LocalClassResolverImpl()
+        components = DeserializationComponents(
+                storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider,
+                localClassResolver, JavaFlexibleTypeCapabilitiesDeserializer
+        )
+        localClassResolver.setDeserializationComponents(components)
+    }
 }

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

@@ -16,22 +16,25 @@
 
 package org.jetbrains.kotlin.builtins
 
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
+import com.google.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.PackageFragmentProviderImpl
 import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
-import org.jetbrains.kotlin.name.*
-import org.jetbrains.kotlin.storage.StorageManager
-import java.io.InputStream
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
-import com.google.protobuf.ExtensionRegistryLite
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
-import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.NameSerializationUtil
 import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ClassData
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.storage.StorageManager
+import java.io.InputStream
 
 public class BuiltinsPackageFragment(
         fqName: FqName,
@@ -56,17 +59,15 @@ public class BuiltinsPackageFragment(
 
     private val members: DeserializedPackageMemberScope = run {
         val proto = loadPackage()
-        DeserializedPackageMemberScope(
-                this,
-                proto,
-                nameResolver,
-                DeserializationComponents(
-                        storageManager, module, BuiltInsClassDataFinder(),
-                        BuiltInsAnnotationAndConstantLoader(getContainingDeclaration()),
-                        provider, FlexibleTypeCapabilitiesDeserializer.ThrowException
-                ),
-                { readClassNames(proto) }
+        val localClassResolver = LocalClassResolverImpl()
+        val components = DeserializationComponents(
+                storageManager, module, BuiltInsClassDataFinder(),
+                BuiltInsAnnotationAndConstantLoader(getContainingDeclaration()),
+                provider, localClassResolver,
+                FlexibleTypeCapabilitiesDeserializer.ThrowException
         )
+        localClassResolver.setDeserializationComponents(components)
+        DeserializedPackageMemberScope(this, proto, nameResolver, components, { readClassNames(proto) })
     }
 
     private fun loadPackage(): ProtoBuf.Package {
@@ -85,8 +86,7 @@ public class BuiltinsPackageFragment(
 
     private inner class BuiltInsClassDataFinder : ClassDataFinder {
         override fun findClassData(classId: ClassId): ClassData? {
-            val metadataPath = BuiltInsSerializationUtil.getClassMetadataPath(classId) ?: return null
-            val stream = loadResource(metadataPath) ?: return null
+            val stream = loadResource(BuiltInsSerializationUtil.getClassMetadataPath(classId)) ?: return null
 
             val classProto = ProtoBuf.Class.parseFrom(stream, extensionRegistry)
 

core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java

@@ -104,7 +104,7 @@ public class KotlinBuiltIns {
     private final Map<JetType, JetType> primitiveJetTypeToJetArrayType;
     private final Map<JetType, JetType> jetArrayTypeToPrimitiveJetType;
 
-    private static final FqNames FQ_NAMES = new FqNames();
+    public static final FqNames FQ_NAMES = new FqNames();
 
     private KotlinBuiltIns() {
         builtInsModule = new ModuleDescriptorImpl(
@@ -147,7 +147,7 @@ public class KotlinBuiltIns {
         jetArrayTypeToPrimitiveJetType.put(arrayType, type);
     }
 
-    private static class FqNames {
+    public static class FqNames {
         public final FqNameUnsafe any = fqNameUnsafe("Any");
         public final FqNameUnsafe nothing = fqNameUnsafe("Nothing");
         public final FqNameUnsafe cloneable = fqNameUnsafe("Cloneable");

core/serialization/serialization.iml

@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="protobuf-java" level="project" />
+    <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="descriptors" exported="" />
     <orderEntry type="module" module-name="util.runtime" />
   </component>

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

@@ -0,0 +1,24 @@
+/*
+ * 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.ClassDescriptor
+import org.jetbrains.kotlin.name.ClassId
+
+public trait LocalClassResolver {
+    public fun resolveLocalClass(classId: ClassId): ClassDescriptor?
+}

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

@@ -0,0 +1,35 @@
+/*
+ * 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.ClassDescriptor
+import org.jetbrains.kotlin.name.ClassId
+import javax.inject.Inject
+import kotlin.properties.Delegates
+
+public class LocalClassResolverImpl : LocalClassResolver {
+    public var components: DeserializationComponents by Delegates.notNull()
+
+    Inject
+    public fun setDeserializationComponents(components: DeserializationComponents) {
+        this.components = components
+    }
+
+    override fun resolveLocalClass(classId: ClassId): ClassDescriptor? {
+        return components.deserializeClass(classId)
+    }
+}

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

@@ -16,12 +16,12 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
 import org.jetbrains.kotlin.types.*
-import org.jetbrains.kotlin.utils.*
+import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.util.LinkedHashMap
 
 public class TypeDeserializer(
@@ -94,7 +94,7 @@ public class TypeDeserializer(
         val id = c.nameResolver.getClassId(fqNameIndex)
         if (id.isLocal()) {
             // Local classes can't be found in scopes
-            return c.components.deserializeClass(id)
+            return c.components.localClassResolver.resolveLocalClass(id)
         }
         return c.components.moduleDescriptor.findClassAcrossModuleDependencies(id)
     }

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

@@ -29,6 +29,7 @@ public class DeserializationComponents(
         public val classDataFinder: ClassDataFinder,
         public val annotationAndConstantLoader: AnnotationAndConstantLoader<AnnotationDescriptor, CompileTimeConstant<*>>,
         public val packageFragmentProvider: PackageFragmentProvider,
+        public val localClassResolver: LocalClassResolver,
         public val flexibleTypeCapabilitiesDeserializer: FlexibleTypeCapabilitiesDeserializer
 ) {
     public val classDeserializer: ClassDeserializer = ClassDeserializer(this)