MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

StreamApiMigration: parentheses in BufferedReader.lines() scenario supported

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-10 12:12:30 +07:00
parent ff72facb5c
commit ec98df958b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java
View File

@@ -1031,7 +1031,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
})) {
return null;
}
PsiMethodCallExpression maybeReadLines = tryCast(lineVar.getInitializer(), PsiMethodCallExpression.class);
PsiMethodCallExpression maybeReadLines = tryCast(PsiUtil.skipParenthesizedExprDown(lineVar.getInitializer()), PsiMethodCallExpression.class);
if (!BUFFERED_READER_READ_LINE.test(maybeReadLines)) return null;
PsiExpression reader = maybeReadLines.getMethodExpression().getQualifierExpression();
PsiReferenceExpression readerRef = tryCast(reader, PsiReferenceExpression.class);
@@ -1049,7 +1049,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
PsiExpressionStatement updateStmt = tryCast(forLoop.getUpdate(), PsiExpressionStatement.class);
if (updateStmt == null) return null;
PsiExpression readNewLineExpr = ExpressionUtils.getAssignmentTo(updateStmt.getExpression(), lineVar);
PsiMethodCallExpression readNewLineCall = tryCast(readNewLineExpr, PsiMethodCallExpression.class);
PsiMethodCallExpression readNewLineCall = tryCast(PsiUtil.skipParenthesizedExprDown(readNewLineExpr), PsiMethodCallExpression.class);
if (!BUFFERED_READER_READ_LINE.test(readNewLineCall)) return null;
if (!ExpressionUtils.isReferenceTo(readNewLineCall.getMethodExpression().getQualifierExpression(), readerVar)) return null;
return new BufferedReaderLines(forLoop, lineVar, reader, false);

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollectForStyle.java
View File

@@ -8,7 +8,7 @@ import java.util.List;
public class Main {
List<String> test(BufferedReader br) throws IOException {
List<String> result = new ArrayList<>();
for <caret>(String line = br.readLine(); line != null; line = br.readLine()) {
for <caret>(String line = ((br.readLine())); line != null; line = (br.readLine())) {
result.add(line.trim());
}
return result;