Rename ExternalSignatureResolver -> SignaturePropagator

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<JavaClassFinderImpl>()
-    useImpl<TraceBasedExternalSignatureResolver>()
+    useImpl<SignaturePropagatorImpl>()
     useImpl<LazyResolveBasedCache>()
     useImpl<TraceBasedErrorReporter>()
     useImpl<PsiBasedExternalAnnotationResolver>()

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()
         );

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 {
+public interface SignaturePropagator {
-    ExternalSignatureResolver DO_NOTHING = new ExternalSignatureResolver() {
+    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<ValueParameterDescriptor> valueParameters,
                 @NotNull List<TypeParameterDescriptor> typeParameters
         ) {
-            return new AlternativeMethodSignature(
+            return new PropagatedSignature(
                     returnType, receiverType, valueParameters, typeParameters, Collections.<String>emptyList(), false
             );
         }
@@ -51,7 +51,7 @@ public interface ExternalSignatureResolver {
         }
     };
 
-    class AlternativeMethodSignature {
+    class PropagatedSignature {
         private final KotlinType returnType;
         private final KotlinType receiverType;
         private final List<ValueParameterDescriptor> valueParameters;
@@ -59,7 +59,7 @@ public interface ExternalSignatureResolver {
         private final List<String> signatureErrors;
         private final boolean hasStableParameterNames;
 
-        public AlternativeMethodSignature(
+        public PropagatedSignature(
                 @NotNull KotlinType returnType,
                 @Nullable KotlinType receiverType,
                 @NotNull List<ValueParameterDescriptor> valueParameters,
@@ -106,7 +106,7 @@ public interface ExternalSignatureResolver {
     }
 
     @NotNull
-    AlternativeMethodSignature resolvePropagatedSignature(
+    PropagatedSignature resolvePropagatedSignature(
             @NotNull JavaMethod method,
             @NotNull ClassDescriptor owner,
             @NotNull KotlinType returnType,

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,

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<TypeParameterDescriptor>, returnType: KotlinType,
             valueParameters: List<ValueParameterDescriptor>
     ): LazyJavaScope.MethodSignatureData {
-        val propagated = c.components.externalSignatureResolver.resolvePropagatedSignature(
+        val propagated = c.components.signaturePropagator.resolvePropagatedSignature(
                 method, ownerDescriptor, returnType, null, valueParameters, methodTypeParameters
         )
         return LazyJavaScope.MethodSignatureData(

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

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
             )