Rename ExternalSignatureResolver -> SignaturePropagator

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<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