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

GuessManagerImpl: fix for incomplete input

Browse Source
This commit is contained in:
Tagir Valeev
2018-01-30 10:05:51 +07:00
parent 1e0612c56a
commit 1a32cd0f85
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
+18 -9
View File
@@ -138,7 +138,6 @@ public class GuessManagerImpl extends GuessManager {
@Nullable
private static MultiMap<PsiExpression, PsiType> buildDataflowTypeMap(PsiExpression forPlace, boolean onlyForPlace) {
PsiType type = forPlace.getType();
if (type == null) return null;
PsiElement scope = DfaPsiUtil.getTopmostBlockInSameClass(forPlace);
if (scope == null) {
PsiFile file = forPlace.getContainingFile();
@@ -157,7 +156,7 @@ public class GuessManagerImpl extends GuessManager {
}
};
TypeConstraint initial = TypeConstraint.EMPTY.withInstanceofValue(runner.getFactory().createDfaType(type));
TypeConstraint initial = type == null ? null : TypeConstraint.EMPTY.withInstanceofValue(runner.getFactory().createDfaType(type));
final ExpressionTypeInstructionVisitor visitor = new ExpressionTypeInstructionVisitor(forPlace, onlyForPlace, initial);
if (runner.analyzeMethodWithInlining(scope, visitor) == RunnerResult.OK) {
return visitor.getResult();
@@ -341,24 +340,34 @@ public class GuessManagerImpl extends GuessManager {
@NotNull
@Override
public List<PsiType> getControlFlowExpressionTypeConjuncts(@NotNull PsiExpression expr) {
List<PsiType> result = null;
PsiExpression place = PsiUtil.skipParenthesizedExprDown(expr);
if (place == null) return Collections.emptyList();
if (place instanceof PsiReferenceExpression) {
PsiElement target = ((PsiReferenceExpression)place).resolve();
if (target instanceof PsiParameter) {
PsiElement parent = target.getParent();
if (parent instanceof PsiParameterList && parent.getParent() instanceof PsiLambdaExpression) {
return getTypesFromDfa(expr);
result = getTypesFromDfa(expr);
}
}
}
if (place == null) return Collections.emptyList();
GuessTypeVisitor visitor = new GuessTypeVisitor(place);
getTopmostBlock(place).accept(visitor);
if (result == null) {
GuessTypeVisitor visitor = new GuessTypeVisitor(place);
getTopmostBlock(place).accept(visitor);
if (visitor.isDfaNeeded()) {
return getTypesFromDfa(expr);
if (visitor.isDfaNeeded()) {
result = getTypesFromDfa(expr);
}
else {
result = visitor.mySpecificType == null ?
Collections.emptyList() : Collections.singletonList(tryGenerify(expr, visitor.mySpecificType));
}
}
return visitor.mySpecificType == null ? Collections.emptyList() : Collections.singletonList(tryGenerify(expr, visitor.mySpecificType));
if (result.equals(Collections.singletonList(expr.getType()))) {
result = Collections.emptyList();
}
return result;
}
@NotNull