diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index 8abd8d2334c..710fa5cf28a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -828,7 +828,7 @@ public class CandidateResolver { ) { ExpressionReceiver receiverToCast = new ExpressionReceiver(JetPsiUtil.safeDeparenthesize(expression, false), actualType); List variants = - AutoCastUtils.getAutoCastVariants(context.trace.getBindingContext(), context.dataFlowInfo, receiverToCast); + AutoCastUtils.getAutoCastVariantsExcludingReceiver(context.trace.getBindingContext(), context.dataFlowInfo, receiverToCast); for (ReceiverValue receiverValue : variants) { JetType possibleType = receiverValue.getType(); if (JetTypeChecker.INSTANCE.isSubtypeOf(possibleType, expectedType)) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java index 69d2098cf16..e2d7e8a5779 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java @@ -39,21 +39,21 @@ public class AutoCastUtils { private AutoCastUtils() {} - public static List getAutoCastVariantsIncludingReceiver( + public static List getAutoCastVariants( @NotNull ReceiverValue receiverToCast, @NotNull ResolutionContext context ) { - return getAutoCastVariantsIncludingReceiver(receiverToCast, context.trace.getBindingContext(), context.dataFlowInfo); + return getAutoCastVariants(receiverToCast, context.trace.getBindingContext(), context.dataFlowInfo); } - public static List getAutoCastVariantsIncludingReceiver( + public static List getAutoCastVariants( @NotNull ReceiverValue receiverToCast, @NotNull BindingContext bindingContext, @NotNull DataFlowInfo dataFlowInfo ) { List variants = Lists.newArrayList(); variants.add(receiverToCast); - variants.addAll(getAutoCastVariants(bindingContext, dataFlowInfo, receiverToCast)); + variants.addAll(getAutoCastVariantsExcludingReceiver(bindingContext, dataFlowInfo, receiverToCast)); return variants; } @@ -61,7 +61,7 @@ public class AutoCastUtils { * @return variants @param receiverToCast may be cast to according to @param dataFlowInfo, @param receiverToCast itself is NOT included */ @NotNull - public static List getAutoCastVariants( + public static List getAutoCastVariantsExcludingReceiver( @NotNull BindingContext bindingContext, @NotNull DataFlowInfo dataFlowInfo, @NotNull ReceiverValue receiverToCast @@ -79,7 +79,7 @@ public class AutoCastUtils { return collectAutoCastReceiverValues(dataFlowInfo, receiver, dataFlowValue); } else if (receiverToCast instanceof AutoCastReceiver) { - return getAutoCastVariants(bindingContext, dataFlowInfo, ((AutoCastReceiver) receiverToCast).getOriginal()); + return getAutoCastVariantsExcludingReceiver(bindingContext, dataFlowInfo, ((AutoCastReceiver) receiverToCast).getOriginal()); } return Collections.emptyList(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java index 5217ae65b74..b913cab0c04 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java @@ -134,7 +134,7 @@ public class TaskPrioritizer { boolean resolveInvoke ) { - List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariantsIncludingReceiver(receiver, c.context); + List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariants(receiver, c.context); //members for (CallableDescriptorCollector callableDescriptorCollector : c.callableDescriptorCollectors) { @@ -169,7 +169,7 @@ public class TaskPrioritizer { ) { Collection memberExtensions = callableDescriptorCollector.getNonMembersByName( implicitReceiver.getType().getMemberScope(), c.name, c.context.trace); - List variantsForImplicitReceiver = AutoCastUtils.getAutoCastVariantsIncludingReceiver(implicitReceiver, c.context); + List variantsForImplicitReceiver = AutoCastUtils.getAutoCastVariants(implicitReceiver, c.context); c.result.addCandidates(convertWithReceivers(memberExtensions, variantsForImplicitReceiver, variantsForExplicitReceiver, resolveInvoke)); } @@ -249,7 +249,7 @@ public class TaskPrioritizer { @NotNull ReceiverValue explicitReceiver, @NotNull TaskPrioritizerContext c ) { - List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariantsIncludingReceiver(explicitReceiver, c.context); + List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariants(explicitReceiver, c.context); for (CallableDescriptorCollector callableDescriptorCollector : c.callableDescriptorCollectors) { addMemberExtensionCandidates(variableReceiver, variantsForExplicitReceiver, callableDescriptorCollector, c, /*resolveInvoke=*/true); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java index 8235f34999e..282aaa95923 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java @@ -69,8 +69,7 @@ public final class TipsManager { info = DataFlowInfo.EMPTY; } - List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariantsIncludingReceiver( - receiverValue, context, info); + List variantsForExplicitReceiver = AutoCastUtils.getAutoCastVariants(receiverValue, context, info); for (ReceiverValue descriptor : variantsForExplicitReceiver) { descriptors.addAll(includeExternalCallableExtensions(