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

StreamApiMigrationInspection: add guard checks for control flow offsets (EA-90493)

Browse Source
This commit is contained in:
Tagir Valeev
2016-10-26 12:35:59 +07:00
parent a75cc0fec7
commit 2f311f5823
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java
+7 -4
View File
@@ -585,12 +585,15 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
catch (AnalysisCanceledException ignored) {
return;
}
int startOffset = tb.getStartOffset(controlFlow);
int endOffset = tb.getEndOffset(controlFlow);
if(startOffset < 0 || endOffset < 0) return;
final Collection<PsiStatement> exitPoints = ControlFlowUtil
.findExitPointsAndStatements(controlFlow, tb.getStartOffset(controlFlow), tb.getEndOffset(controlFlow),
new IntArrayList(), PsiContinueStatement.class,
.findExitPointsAndStatements(controlFlow, startOffset, endOffset, new IntArrayList(), PsiContinueStatement.class,
PsiBreakStatement.class, PsiReturnStatement.class, PsiThrowStatement.class);
int startOffset = controlFlow.getStartOffset(body);
int endOffset = controlFlow.getEndOffset(body);
startOffset = controlFlow.getStartOffset(body);
endOffset = controlFlow.getEndOffset(body);
if(startOffset < 0 || endOffset < 0) return;
PsiElement surrounder = PsiTreeUtil.getParentOfType(statement, PsiLambdaExpression.class, PsiClass.class);
final List<PsiVariable> nonFinalVariables = StreamEx.of(ControlFlowUtil.getUsedVariables(controlFlow, startOffset, endOffset))
.remove(variable -> PsiTreeUtil.getParentOfType(variable, PsiLambdaExpression.class, PsiClass.class) != surrounder)