diff options
Diffstat (limited to 'java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java')
-rw-r--r-- | java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java index d04ef1bbb295..d4beda08c875 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java @@ -275,10 +275,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo final PsiIfStatement ifStmt = extractIfStatement(body); String foreEachText = wrapInBlock(body); - String iterated = iteratedValue instanceof PsiCallExpression || - iteratedValue instanceof PsiReferenceExpression || - iteratedValue instanceof PsiQualifiedExpression || - iteratedValue instanceof PsiParenthesizedExpression ? iteratedValue.getText() : "(" + iteratedValue.getText() + ")"; + String iterated = getIteratedValueText(iteratedValue); if (ifStmt != null) { final PsiExpression condition = ifStmt.getCondition(); if (condition != null) { @@ -359,7 +356,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo final PsiIfStatement ifStatement = extractIfStatement(body); final PsiMethodCallExpression methodCallExpression = extractAddCall(body); - String iteration = iteratedValue.getText() + ".stream()"; + String iteration = getIteratedValueText(iteratedValue) + ".stream()"; if (ifStatement != null) { final PsiExpression condition = ifStatement.getCondition(); if (condition != null) { @@ -443,6 +440,13 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo } } + private static String getIteratedValueText(PsiExpression iteratedValue) { + return iteratedValue instanceof PsiCallExpression || + iteratedValue instanceof PsiReferenceExpression || + iteratedValue instanceof PsiQualifiedExpression || + iteratedValue instanceof PsiParenthesizedExpression ? iteratedValue.getText() : "(" + iteratedValue.getText() + ")"; + } + public static PsiIfStatement extractIfStatement(PsiStatement body) { PsiIfStatement ifStmt = null; if (body instanceof PsiIfStatement) { |