diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt index 11c1d7862e2..219205366f4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt @@ -56,7 +56,7 @@ public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentS useInstance(JvmVirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope)) useImpl() - useImpl() + useImpl() useImpl() useImpl() useImpl() diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagatorImpl.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagatorImpl.java index 22647cfc901..d82275fd67f 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagatorImpl.java @@ -30,16 +30,16 @@ import org.jetbrains.kotlin.types.KotlinType; import java.util.List; -public class TraceBasedExternalSignatureResolver implements ExternalSignatureResolver { +public class SignaturePropagatorImpl implements SignaturePropagator { private final BindingTrace trace; - public TraceBasedExternalSignatureResolver(@NotNull BindingTrace trace) { + public SignaturePropagatorImpl(@NotNull BindingTrace trace) { this.trace = trace; } @Override @NotNull - public AlternativeMethodSignature resolvePropagatedSignature( + public PropagatedSignature resolvePropagatedSignature( @NotNull JavaMethod method, @NotNull ClassDescriptor owner, @NotNull KotlinType returnType, @@ -49,7 +49,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes ) { SignaturesPropagationData data = new SignaturesPropagationData(owner, returnType, receiverType, valueParameters, typeParameters, method); - return new AlternativeMethodSignature( + return new PropagatedSignature( returnType, data.getModifiedReceiverType(), data.getModifiedValueParameters(), typeParameters, data.getSignatureErrors(), data.getModifiedHasStableParameterNames() ); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java index e5cde880543..6d1a245b93d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java @@ -28,11 +28,11 @@ import org.jetbrains.kotlin.types.KotlinType; import java.util.Collections; import java.util.List; -public interface ExternalSignatureResolver { - ExternalSignatureResolver DO_NOTHING = new ExternalSignatureResolver() { +public interface SignaturePropagator { + SignaturePropagator DO_NOTHING = new SignaturePropagator() { @NotNull @Override - public AlternativeMethodSignature resolvePropagatedSignature( + public PropagatedSignature resolvePropagatedSignature( @NotNull JavaMethod method, @NotNull ClassDescriptor owner, @NotNull KotlinType returnType, @@ -40,7 +40,7 @@ public interface ExternalSignatureResolver { @NotNull List valueParameters, @NotNull List typeParameters ) { - return new AlternativeMethodSignature( + return new PropagatedSignature( returnType, receiverType, valueParameters, typeParameters, Collections.emptyList(), false ); } @@ -51,7 +51,7 @@ public interface ExternalSignatureResolver { } }; - class AlternativeMethodSignature { + class PropagatedSignature { private final KotlinType returnType; private final KotlinType receiverType; private final List valueParameters; @@ -59,7 +59,7 @@ public interface ExternalSignatureResolver { private final List signatureErrors; private final boolean hasStableParameterNames; - public AlternativeMethodSignature( + public PropagatedSignature( @NotNull KotlinType returnType, @Nullable KotlinType receiverType, @NotNull List valueParameters, @@ -106,7 +106,7 @@ public interface ExternalSignatureResolver { } @NotNull - AlternativeMethodSignature resolvePropagatedSignature( + PropagatedSignature resolvePropagatedSignature( @NotNull JavaMethod method, @NotNull ClassDescriptor owner, @NotNull KotlinType returnType, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt index d381a23ba96..a8fbb81c263 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver -import org.jetbrains.kotlin.load.java.components.ExternalSignatureResolver +import org.jetbrains.kotlin.load.java.components.SignaturePropagator import org.jetbrains.kotlin.load.java.components.JavaResolverCache import org.jetbrains.kotlin.load.java.components.SamConversionResolver import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver @@ -42,7 +42,7 @@ class JavaResolverComponents( val kotlinClassFinder: KotlinClassFinder, val deserializedDescriptorResolver: DeserializedDescriptorResolver, val externalAnnotationResolver: ExternalAnnotationResolver, - val externalSignatureResolver: ExternalSignatureResolver, + val signaturePropagator: SignaturePropagator, val errorReporter: ErrorReporter, val javaResolverCache: JavaResolverCache, val javaPropertyInitializerEvaluator: JavaPropertyInitializerEvaluator, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 971bb1f6e7b..d4a4b3d3a60 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -422,7 +422,7 @@ public class LazyJavaClassMemberScope( method: JavaMethod, methodTypeParameters: List, returnType: KotlinType, valueParameters: List ): LazyJavaScope.MethodSignatureData { - val propagated = c.components.externalSignatureResolver.resolvePropagatedSignature( + val propagated = c.components.signaturePropagator.resolvePropagatedSignature( method, ownerDescriptor, returnType, null, valueParameters, methodTypeParameters ) return LazyJavaScope.MethodSignatureData( diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt index d0071104eea..8eea65bdb9e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt @@ -138,7 +138,7 @@ public abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : functionDescriptorImpl.setParameterNamesStatus(effectiveSignature.hasStableParameterNames, valueParameters.hasSynthesizedNames) if (effectiveSignature.errors.isNotEmpty()) { - c.components.externalSignatureResolver.reportSignatureErrors(functionDescriptorImpl, effectiveSignature.errors) + c.components.signaturePropagator.reportSignatureErrors(functionDescriptorImpl, effectiveSignature.errors) } return functionDescriptorImpl diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt index 9ccdcb4b89f..75c89d48d59 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt @@ -57,7 +57,7 @@ public class RuntimeModuleData private constructor(public val deserialization: D val runtimePackageFacadeProvider = RuntimePackagePartProvider(classLoader) val globalJavaResolverContext = JavaResolverComponents( storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver, - ExternalAnnotationResolver.EMPTY, ExternalSignatureResolver.DO_NOTHING, RuntimeErrorReporter, JavaResolverCache.EMPTY, + ExternalAnnotationResolver.EMPTY, SignaturePropagator.DO_NOTHING, RuntimeErrorReporter, JavaResolverCache.EMPTY, JavaPropertyInitializerEvaluator.DoNothing, SamConversionResolver, RuntimeSourceElementFactory, singleModuleClassResolver, runtimePackageFacadeProvider, SupertypeLoopChecker.EMPTY, LookupTracker.DO_NOTHING )