MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

NullityInference: better handling of ternary, parentheses, casts

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-31 17:42:18 +07:00
parent cc96b03c52
commit fd3dde8aa7
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInferenceIndex.kt
View File

@@ -32,7 +32,7 @@ import java.util.*
* @author peter
*/
private val gist = GistManager.getInstance().newPsiFileGist("contractInference", 1, MethodDataExternalizer) { file ->
private val gist = GistManager.getInstance().newPsiFileGist("contractInference", 2, MethodDataExternalizer) { file ->
indexFile(file.node.lighterAST)
}

35
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullityInference.java
View File

@@ -93,10 +93,18 @@ public class NullityInference {
private void visitReturnedValue(LighterASTNode expr) {
IElementType type = expr.getTokenType();
while (type == PARENTH_EXPRESSION) {
expr = JavaLightTreeUtil.findExpressionChild(tree, expr);
if (expr == null) {
hasUnknowns = true;
return;
}
type = expr.getTokenType();
}
if (containsNulls(expr)) {
hasNulls = true;
}
else if (type == LAMBDA_EXPRESSION || type == NEW_EXPRESSION ||
else if (type == LAMBDA_EXPRESSION || type == NEW_EXPRESSION || type == METHOD_REF_EXPRESSION ||
type == LITERAL_EXPRESSION || type == BINARY_EXPRESSION || type == POLYADIC_EXPRESSION) {
hasNotNulls = true;
}
@@ -106,20 +114,29 @@ public class NullityInference {
delegates.putValue(calledMethod, ExpressionRange.create(expr, body.getStartOffset()));
}
}
else if (type == CONDITIONAL_EXPRESSION) {
List<LighterASTNode> expressionChildren = JavaLightTreeUtil.getExpressionChildren(tree, expr);
if(expressionChildren.size() == 3) {
visitReturnedValue(expressionChildren.get(1)); // then-branch
visitReturnedValue(expressionChildren.get(2)); // else-branch
} else {
hasUnknowns = true;
}
}
else if (type == TYPE_CAST_EXPRESSION) {
LighterASTNode child = JavaLightTreeUtil.findExpressionChild(tree, expr);
if(child != null) {
visitReturnedValue(child);
} else {
hasUnknowns = true;
}
}
else {
hasUnknowns = true;
}
}
private boolean containsNulls(@NotNull LighterASTNode value) {
if (value.getTokenType() == CONDITIONAL_EXPRESSION) {
List<LighterASTNode> exprChildren = JavaLightTreeUtil.getExpressionChildren(tree, value);
return exprChildren.subList(1, exprChildren.size()).stream().anyMatch(e -> containsNulls(e));
}
if (value.getTokenType() == PARENTH_EXPRESSION) {
LighterASTNode wrapped = JavaLightTreeUtil.findExpressionChild(tree, value);
return wrapped != null && containsNulls(wrapped);
}
return value.getTokenType() == LITERAL_EXPRESSION && tree.getChildren(value).get(0).getTokenType() == JavaTokenType.NULL_KEYWORD;
}