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

prevent SOE on cyclic inheritance (EA-91135 - SOE: ExpectedTypesProvider.processAllSuperTypes)

Browse Source
This commit is contained in:
peter
2016-11-04 15:15:16 +01:00
parent c1eb648df5
commit 857263f5dc
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+8 -6
View File
@@ -39,8 +39,9 @@ import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.NullableFunction;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.*;
import com.intellij.util.containers.HashMap;
import com.intellij.util.containers.HashSet;
import com.intellij.util.containers.Stack;
import com.siyeh.ig.psiutils.ExpressionUtils;
import gnu.trove.THashSet;
@@ -179,7 +180,7 @@ public class ExpectedTypesProvider {
}
if (infoImpl.getKind() == ExpectedTypeInfo.TYPE_OR_SUPERTYPE) {
processAllSuperTypes(infoImpl.getType(), visitor, project, set);
processAllSuperTypes(infoImpl.getType(), visitor, project, set, new HashSet<>());
}
else if (infoImpl.getKind() == ExpectedTypeInfo.TYPE_OR_SUBTYPE) {
if (infoImpl.getType() instanceof PsiPrimitiveType) {
@@ -209,7 +210,9 @@ public class ExpectedTypesProvider {
}
}
public static void processAllSuperTypes(@NotNull PsiType type, @NotNull PsiTypeVisitor<PsiType> visitor, @NotNull Project project, @NotNull Set<PsiType> set) {
public static void processAllSuperTypes(@NotNull PsiType type, @NotNull PsiTypeVisitor<PsiType> visitor, @NotNull Project project, @NotNull Set<PsiType> set, @NotNull Set<PsiType> visited) {
if (!visited.add(type)) return;
if (type instanceof PsiPrimitiveType) {
if (type.equals(PsiType.BOOLEAN) || type.equals(PsiType.VOID) || type.equals(PsiType.NULL)) return;
@@ -229,10 +232,9 @@ public class ExpectedTypesProvider {
processType(objectType, visitor, set);
if (type instanceof PsiClassType) {
PsiType[] superTypes = type.getSuperTypes();
for (PsiType superType : superTypes) {
for (PsiType superType : type.getSuperTypes()) {
processType(superType, visitor, set);
processAllSuperTypes(superType, visitor, project, set);
processAllSuperTypes(superType, visitor, project, set, visited);
}
}
}
java/java-impl/src/com/intellij/codeInsight/completion/MethodReturnTypeProvider.java
+2 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.Set;
import static com.intellij.patterns.PsiJavaPatterns.psiElement;
@@ -68,7 +69,7 @@ class MethodReturnTypeProvider extends CompletionProvider<CompletionParameters>
};
for (PsiType type : getReturnTypeCandidates(method)) {
eachProcessor.visitType(type);
ExpectedTypesProvider.processAllSuperTypes(type, eachProcessor, position.getProject(), ContainerUtil.<PsiType>newHashSet());
ExpectedTypesProvider.processAllSuperTypes(type, eachProcessor, position.getProject(), new HashSet<>(), new HashSet<>());
}
}