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

StreamApiMigrationInspection: support parentheses in while(((line) = readLine()) != null)

Browse Source
This commit is contained in:
Tagir Valeev
2018-11-08 17:15:26 +07:00
parent 66974e7445
commit 40dd2986ae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java
+5 -2
View File
@@ -948,7 +948,10 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
@Override
boolean isWriteAllowed(PsiVariable variable, PsiExpression reference) {
if (myVariable == variable) {
if (reference.getParent() == PsiTreeUtil.getParentOfType(myExpression, PsiAssignmentExpression.class)) return true;
if (PsiUtil.skipParenthesizedExprUp(reference.getParent()) ==
PsiTreeUtil.getParentOfType(myExpression, PsiAssignmentExpression.class)) {
return true;
}
PsiForStatement forStatement = PsiTreeUtil.getParentOfType(variable, PsiForStatement.class);
if (forStatement != null && forStatement == PsiTreeUtil.getParentOfType(myVariable, PsiForStatement.class)) {
return PsiTreeUtil.isAncestor(forStatement.getUpdate(), reference, false) ||
@@ -985,7 +988,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
if (!BUFFERED_READER_READ_LINE.test(readerCall)) return null;
PsiExpression reader = readerCall.getMethodExpression().getQualifierExpression();
PsiLocalVariable lineVar = ExpressionUtils.resolveLocalVariable(assignment.getLExpression());
PsiLocalVariable lineVar = ExpressionUtils.resolveLocalVariable(PsiUtil.skipParenthesizedExprDown(assignment.getLExpression()));
if (lineVar == null) return null;
if (ReferencesSearch.search(lineVar).anyMatch(ref -> !PsiTreeUtil.isAncestor(loopStatement, ref.getElement(), true))) {
return null;