diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java index 0e7c7276dfd4..11430747f69d 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java @@ -137,12 +137,10 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns } private void handleToArray(PsiMethodCallExpression methodCall) { - PsiReferenceExpression methodExpression = methodCall.getMethodExpression(); - PsiExpression qualifier = methodExpression.getQualifierExpression(); - if(qualifier instanceof PsiMethodCallExpression && isCollectionStream((PsiMethodCallExpression)qualifier)) { + if(isCollectionStream(getQualifierMethodCall(methodCall))) { PsiArrayType type = getArrayType(methodCall); if(type != null) { - PsiElement nameElement = methodExpression.getReferenceNameElement(); + PsiElement nameElement = methodCall.getMethodExpression().getReferenceNameElement(); LOG.assertTrue(nameElement != null); String replacement = type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT+"[]") ? "" : "new "+type.getCanonicalText().replaceFirst("\\[]", "[0]");