From ce1cd46ebd0908775060f4ad9e849ed8f3e70dde Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 13 Jun 2018 11:37:18 +0700 Subject: [PATCH] BaseStreamApiMigration: simplified denotable replacement --- .../streamMigration/BaseStreamApiMigration.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java index b94b0018623d..35461a5da098 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java @@ -79,12 +79,7 @@ abstract class BaseStreamApiMigration { else { if (status == ControlFlowUtils.InitializerUsageStatus.AT_WANTED_PLACE_ONLY) { PsiTypeElement typeElement = var.getTypeElement(); - if (typeElement != null && typeElement.isInferredType()) { - if (PsiTypesUtil.isDenotableType(typeElement.getType(), var)) { - PsiTypesUtil.replaceWithExplicitType(typeElement); - ct.delete(initializer); - } - } else { + if (typeElement == null || !typeElement.isInferredType() || PsiTypesUtil.replaceWithExplicitType(typeElement) != null) { ct.delete(initializer); } }