From 87d9169d09190f9e2d5642ec0ea07c1c5142ee4c Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Wed, 23 Nov 2016 10:52:31 +0100 Subject: [PATCH] postpone check for accessible to prevent access to another (lombok) index (IDEA-159135) [^peter] --- .../com/intellij/psi/impl/java/ReferenceChainLink.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/java/ReferenceChainLink.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/ReferenceChainLink.java index 15ccb80fa2b0..31c6527bc090 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/java/ReferenceChainLink.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/java/ReferenceChainLink.java @@ -29,8 +29,11 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** * @author peter @@ -83,8 +86,7 @@ public class ReferenceChainLink { List candidates = new ArrayList<>(); AtomicInteger count = new AtomicInteger(); Processor processor = member -> { - if (canBeAccessible(placeFile, member) && (!(member instanceof PsiMethod) || - ApproximateResolver.canHaveArgCount((PsiMethod)member, argCount))) { + if (!(member instanceof PsiMethod && !ApproximateResolver.canHaveArgCount((PsiMethod)member, argCount))) { candidates.add(member); } return count.incrementAndGet() < 42; @@ -112,7 +114,7 @@ public class ReferenceChainLink { return null; } - return candidates; + return candidates.stream().filter(candidate -> canBeAccessible(placeFile, candidate)).collect(Collectors.toList()); } private static boolean canBeAccessible(VirtualFile placeFile, PsiMember member) {