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

[groovy] substitutor computer: compute exit points atomically

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-11-07 14:17:19 +03:00
parent cdfc87e746
commit d13c994af5
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java
+16 -24
View File
@@ -16,10 +16,10 @@
package org.jetbrains.plugins.groovy.lang.resolve.processors;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.AtomicNotNullLazyValue;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.util.*;
import com.intellij.util.containers.hash.HashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.codeInspection.utils.ControlFlowUtils;
@@ -45,7 +45,10 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GdkMethodUtil;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
import java.util.Set;
import java.util.Collection;
import static com.intellij.util.containers.ContainerUtil.emptyList;
import static com.intellij.util.containers.ContainerUtil.newHashSet;
/**
* @author Max Medvedev
@@ -58,12 +61,10 @@ public class SubstitutorComputer {
private final PsiType myThisType;
@Nullable private final PsiType[] myArgumentTypes;
private final PsiType[] myTypeArguments;
private final GrControlFlowOwner myFlowOwner;
private final PsiElement myPlaceToInferContext;
private final AtomicNotNullLazyValue<Collection<PsiElement>> myExitPoints;
private final PsiResolveHelper myHelper;
public SubstitutorComputer(PsiType thisType,
@Nullable PsiType[] argumentTypes,
PsiType[] typeArguments,
@@ -74,22 +75,23 @@ public class SubstitutorComputer {
myTypeArguments = typeArguments;
myPlace = place;
myPlaceToInferContext = placeToInferContext;
if (canBeExitPoint(place)) {
myFlowOwner = ControlFlowUtils.findControlFlowOwner(place);
}
else {
myFlowOwner = null;
}
myExitPoints = AtomicNotNullLazyValue.createValue(() -> {
if (canBeExitPoint(place)) {
GrControlFlowOwner flowOwner = ControlFlowUtils.findControlFlowOwner(place);
return newHashSet(ControlFlowUtils.collectReturns(flowOwner));
}
else {
return emptyList();
}
});
myHelper = JavaPsiFacade.getInstance(myPlace.getProject()).getResolveHelper();
}
@Nullable
protected PsiType inferContextType() {
final PsiElement parent = myPlaceToInferContext.getParent();
if (parent instanceof GrReturnStatement || exitsContains(myPlaceToInferContext)) {
if (parent instanceof GrReturnStatement || myExitPoints.getValue().contains(myPlaceToInferContext)) {
final GrMethod method = PsiTreeUtil.getParentOfType(parent, GrMethod.class, true, GrClosableBlock.class);
if (method != null) {
return method.getReturnType();
@@ -272,16 +274,6 @@ public class SubstitutorComputer {
return substitutor;
}
private Set<PsiElement> myExitPoints;
protected boolean exitsContains(PsiElement place) {
if (myFlowOwner == null) return false;
if (myExitPoints == null) {
myExitPoints = new HashSet<>();
myExitPoints.addAll(ControlFlowUtils.collectReturns(myFlowOwner));
}
return myExitPoints.contains(place);
}
public PsiType[] getTypeArguments() {
return myTypeArguments;
}