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

IDEA-18499 <logic:iterate> confuses always true inspection

Browse Source
This commit is contained in:
peter
2015-07-10 20:38:54 +02:00
parent bcc1f55c12
commit 83b5a41c82
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+8 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.templateLanguages.OuterLanguageElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.*;
import com.intellij.util.IncorrectOperationException;
@@ -64,7 +65,12 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
myFactory = valueFactory;
}
@Nullable
public ControlFlow buildControlFlow(@NotNull PsiElement codeFragment, boolean ignoreAssertions) {
if (PsiTreeUtil.findChildOfType(codeFragment, OuterLanguageElement.class) != null) {
return null;
}
myIgnoreAssertions = ignoreAssertions;
final PsiManager manager = codeFragment.getManager();
GlobalSearchScope scope = codeFragment.getResolveScope();
@@ -73,7 +79,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
myNpe = createClassType(manager, scope, JAVA_LANG_NULL_POINTER_EXCEPTION);
myAssertionError = createClassType(manager, scope, JAVA_LANG_ASSERTION_ERROR);
myString = myFactory.createTypeValue(createClassType(manager, scope, JAVA_LANG_STRING), Nullness.NOT_NULL);
myExceptionHolders = new FactoryMap<PsiTryStatement, DfaVariableValue>() {
@Nullable
@Override
@@ -96,7 +102,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
PsiElement parent = codeFragment.getParent();
if (parent instanceof PsiLambdaExpression && codeFragment instanceof PsiExpression) {
generateBoxingUnboxingInstructionFor((PsiExpression)codeFragment,
generateBoxingUnboxingInstructionFor((PsiExpression)codeFragment,
LambdaUtil.getFunctionalInterfaceReturnType((PsiLambdaExpression)parent));
addInstruction(new CheckReturnValueInstruction(codeFragment));
}