azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicates from implicit receiver hierarchy while building tasks

Browse Source
This commit is contained in:
Svetlana Isakova
2014-02-12 19:35:56 +04:00
parent 1c5df773c5
commit 0a9dbbea79
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java
+5 -7
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.resolve.calls.tasks; package org.jetbrains.jet.lang.resolve.calls.tasks;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -38,10 +39,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.PackageType; import org.jetbrains.jet.lang.types.PackageType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.isOrOverridesSynthesized; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.isOrOverridesSynthesized;
import static org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*; import static org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*;
@@ -119,7 +117,7 @@ public class TaskPrioritizer {
addCandidatesForInvoke(receiver, c); addCandidatesForInvoke(receiver, c);
return; return;
} }
List<ReceiverValue> implicitReceivers = JetScopeUtils.getImplicitReceiversHierarchyValues(c.scope); Collection<ReceiverValue> implicitReceivers = Sets.newLinkedHashSet(JetScopeUtils.getImplicitReceiversHierarchyValues(c.scope));
if (receiver.exists()) { if (receiver.exists()) {
addCandidatesForExplicitReceiver(receiver, implicitReceivers, c, /*isExplicit=*/true); addCandidatesForExplicitReceiver(receiver, implicitReceivers, c, /*isExplicit=*/true);
return; return;
@@ -129,7 +127,7 @@ public class TaskPrioritizer {
private static <D extends CallableDescriptor, F extends D> void addCandidatesForExplicitReceiver( private static <D extends CallableDescriptor, F extends D> void addCandidatesForExplicitReceiver(
@NotNull ReceiverValue explicitReceiver, @NotNull ReceiverValue explicitReceiver,
@NotNull List<ReceiverValue> implicitReceivers, @NotNull Collection<ReceiverValue> implicitReceivers,
@NotNull TaskPrioritizerContext<D, F> c, @NotNull TaskPrioritizerContext<D, F> c,
boolean isExplicit boolean isExplicit
) { ) {
@@ -180,7 +178,7 @@ public class TaskPrioritizer {
} }
private static <D extends CallableDescriptor, F extends D> void addCandidatesForNoReceiver( private static <D extends CallableDescriptor, F extends D> void addCandidatesForNoReceiver(
@NotNull List<ReceiverValue> implicitReceivers, @NotNull Collection<ReceiverValue> implicitReceivers,
@NotNull TaskPrioritizerContext<D, F> c @NotNull TaskPrioritizerContext<D, F> c
) { ) {
List<Collection<ResolutionCandidate<D>>> localsList = Lists.newArrayList(); List<Collection<ResolutionCandidate<D>>> localsList = Lists.newArrayList();