MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

method chains completion: don't search for functional interfaces, java.lang classes

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-04-26 19:21:47 +03:00
parent e493105ccf
commit e825c04d29
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainSearchTarget.java
+9 -1
View File
@@ -15,16 +15,22 @@
*/
package com.intellij.compiler.chainsSearch.context;
import com.intellij.ide.hierarchy.JavaHierarchyUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.backwardRefs.SignatureData;
import java.util.Set;
/**
* @author Dmitry Batkovich
*/
public class ChainSearchTarget {
private static final Set<String> EXCLUDED_PACKAGES = ContainerUtil.set("java.lang", "java.util.function");
private final String myClassQName;
private final byte[] myAcceptedArrayKinds;
private final PsiType myPsiType;
@@ -94,8 +100,10 @@ public class ChainSearchTarget {
@Nullable
private static ChainSearchTarget create(PsiClassType classType) {
PsiClass resolvedClass = PsiUtil.resolveClassInClassTypeOnly(classType);
if (resolvedClass == null || resolvedClass instanceof PsiTypeParameter || LambdaUtil.isFunctionalClass(resolvedClass)) return null;
String packageName = JavaHierarchyUtil.getPackageName(resolvedClass);
if (packageName == null || EXCLUDED_PACKAGES.contains(packageName)) return null;
byte iteratorKind = SignatureData.ZERO_DIM;
if (resolvedClass == null) return null;
String iteratorClass = getIteratorKind(resolvedClass);
if (iteratorClass != null) {
resolvedClass = PsiUtil.resolveClassInClassTypeOnly(PsiUtil.substituteTypeParameter(classType, iteratorClass, 0, false));