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

CollectMigration#targetReferences: null-check

Browse Source 
Fixes EA-131234 - IAE: ReferencesSearch.$$$reportNull$$$
This commit is contained in:
Tagir Valeev
2018-11-18 10:06:11 +07:00
parent 27f18249c7
commit 7b5eca3213
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamMigration/CollectMigration.java
+3 -2
View File
@@ -159,11 +159,11 @@ class CollectMigration extends BaseStreamApiMigration {
}
abstract static class CollectTerminal {
private final PsiLocalVariable myTargetVariable;
private final @Nullable PsiLocalVariable myTargetVariable;
private final InitializerUsageStatus myStatus;
private final PsiStatement myLoop;
protected CollectTerminal(PsiLocalVariable variable, PsiStatement loop, InitializerUsageStatus status) {
protected CollectTerminal(@Nullable PsiLocalVariable variable, PsiStatement loop, InitializerUsageStatus status) {
myTargetVariable = variable;
myLoop = loop;
myStatus = status;
@@ -180,6 +180,7 @@ class CollectMigration extends BaseStreamApiMigration {
abstract String generateIntermediate(CommentTracker ct);
StreamEx<? extends PsiExpression> targetReferences() {
if (myTargetVariable == null) return StreamEx.empty();
List<PsiElement> usedElements = usedElements().toList();
return StreamEx.of(ReferencesSearch.search(myTargetVariable).findAll()).select(PsiReferenceExpression.class)
.filter(ref -> usedElements.stream().noneMatch(allowedUsage -> PsiTreeUtil.isAncestor(allowedUsage, ref, false)));