From c1d3f7e5b4a0ead89be80e3610e19831fca38546 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 24 Dec 2021 12:40:04 +0300 Subject: [PATCH] [FE 1.0] Rename `ambiguity`'s parameter from `descriptors` to `resolvedCalls` --- .../resolve/calls/tasks/AbstractTracingStrategy.java | 4 ++-- .../kotlin/resolve/calls/tasks/TracingStrategy.java | 4 ++-- ...TracingStrategyForImplicitConstructorDelegationCall.kt | 2 +- .../types/expressions/ControlStructureTypingUtils.java | 2 +- .../kotlin/types/expressions/FakeCallResolver.kt | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java index e5c37d7f508..615bc25b188 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java @@ -115,8 +115,8 @@ public abstract class AbstractTracingStrategy implements TracingStrategy { } @Override - public void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> descriptors) { - trace.report(OVERLOAD_RESOLUTION_AMBIGUITY.on(reference, descriptors)); + public void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> resolvedCalls) { + trace.report(OVERLOAD_RESOLUTION_AMBIGUITY.on(reference, resolvedCalls)); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java index b20f8206012..3f1389d1378 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java @@ -70,7 +70,7 @@ public interface TracingStrategy { public void wrongNumberOfTypeArguments(@NotNull BindingTrace trace, int expectedTypeArgumentCount, @NotNull CallableDescriptor descriptor) {} @Override - public void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> descriptors) {} + public void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> resolvedCalls) {} @Override public void noneApplicable(@NotNull BindingTrace trace, @NotNull Collection> descriptors) {} @@ -135,7 +135,7 @@ public interface TracingStrategy { @NotNull CallableDescriptor descriptor ); - void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> descriptors); + void ambiguity(@NotNull BindingTrace trace, @NotNull Collection> resolvedCalls); void noneApplicable(@NotNull BindingTrace trace, @NotNull Collection> descriptors); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForImplicitConstructorDelegationCall.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForImplicitConstructorDelegationCall.kt index f485b73ef3a..9756c543ed2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForImplicitConstructorDelegationCall.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForImplicitConstructorDelegationCall.kt @@ -69,7 +69,7 @@ class TracingStrategyForImplicitConstructorDelegationCall( reportError(trace) } - override fun ambiguity(trace: BindingTrace, descriptors: MutableCollection>) { + override fun ambiguity(trace: BindingTrace, resolvedCalls: MutableCollection>) { reportError(trace) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index 7e1c46f5bf8..965dc84a70a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -634,7 +634,7 @@ public class ControlStructureTypingUtils { @Override public void ambiguity( - @NotNull BindingTrace trace, @NotNull Collection> descriptors + @NotNull BindingTrace trace, @NotNull Collection> resolvedCalls ) { logError(); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt index 241748e9471..681784d8852 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt @@ -95,8 +95,8 @@ class FakeCallResolver( val call: Call ) : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) { - override fun ambiguity(trace: BindingTrace, descriptors: Collection>) { - trace.report(Errors.COMPONENT_FUNCTION_AMBIGUITY.on(reportErrorsOn, name, descriptors)) + override fun ambiguity(trace: BindingTrace, resolvedCalls: Collection>) { + trace.report(Errors.COMPONENT_FUNCTION_AMBIGUITY.on(reportErrorsOn, name, resolvedCalls)) } override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) { @@ -117,8 +117,8 @@ class FakeCallResolver( val call: Call ) : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) { - override fun ambiguity(trace: BindingTrace, descriptors: Collection>) { - trace.report(Errors.ITERATOR_AMBIGUITY.on(reportErrorsOn, descriptors)) + override fun ambiguity(trace: BindingTrace, resolvedCalls: Collection>) { + trace.report(Errors.ITERATOR_AMBIGUITY.on(reportErrorsOn, resolvedCalls)) } override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) {