add flexibleTypeCapabilitiesDeserializer field to BuiltinsPackageFragment
This commit is contained in:
@@ -40,6 +40,7 @@ public class BuiltinsPackageFragment(
|
||||
fqName: FqName,
|
||||
storageManager: StorageManager,
|
||||
module: ModuleDescriptor,
|
||||
flexibleTypeCapabilitiesDeserializer: FlexibleTypeCapabilitiesDeserializer,
|
||||
private val loadResource: (path: String) -> InputStream?
|
||||
) : PackageFragmentDescriptorImpl(module, fqName) {
|
||||
|
||||
@@ -64,7 +65,7 @@ public class BuiltinsPackageFragment(
|
||||
storageManager, module, BuiltInsClassDataFinder(),
|
||||
BuiltInsAnnotationAndConstantLoader(getContainingDeclaration()),
|
||||
provider, localClassResolver,
|
||||
FlexibleTypeCapabilitiesDeserializer.ThrowException
|
||||
flexibleTypeCapabilitiesDeserializer
|
||||
)
|
||||
localClassResolver.setDeserializationComponents(components)
|
||||
DeserializedPackageMemberScope(this, proto, nameResolver, components, { readClassNames(proto) })
|
||||
|
||||
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
|
||||
import org.jetbrains.kotlin.resolve.DescriptorUtils;
|
||||
import org.jetbrains.kotlin.resolve.ImportPath;
|
||||
import org.jetbrains.kotlin.resolve.scopes.JetScope;
|
||||
import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer;
|
||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
|
||||
import org.jetbrains.kotlin.types.*;
|
||||
import org.jetbrains.kotlin.types.checker.JetTypeChecker;
|
||||
@@ -110,6 +111,7 @@ public class KotlinBuiltIns {
|
||||
);
|
||||
builtinsPackageFragment = new BuiltinsPackageFragment(
|
||||
BUILT_INS_PACKAGE_FQ_NAME, new LockBasedStorageManager(), builtInsModule,
|
||||
FlexibleTypeCapabilitiesDeserializer.ThrowException.INSTANCE$,
|
||||
new Function1<String, InputStream>() {
|
||||
@Override
|
||||
public InputStream invoke(String path) {
|
||||
|
||||
Reference in New Issue
Block a user