From 4296de3a2e081256db60d6671920903ddce4351d Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 24 Jan 2018 15:46:56 +0700 Subject: [PATCH] ConditionalCanBeOptionalInspection: activate always on condition (even in information mode) Review ID: IDEA-CR-28692 --- .../codeInspection/ConditionalCanBeOptionalInspection.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java b/java/java-impl/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java index 453b5df3576d..3b838aaab9e9 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java @@ -6,7 +6,6 @@ import com.intellij.codeInspection.dataFlow.NullnessUtil; import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.openapi.project.Project; -import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.search.LocalSearchScope; @@ -48,8 +47,7 @@ public class ConditionalCanBeOptionalInspection extends AbstractBaseJavaLocalIns boolean mayChangeSemantics = !ExpressionUtils.isNullLiteral(nullBranch) && NullnessUtil.getExpressionNullness(notNullBranch, true) != Nullness.NOT_NULL; if (!isOnTheFly && mayChangeSemantics) return; - boolean informationLevel = mayChangeSemantics || InspectionProjectProfileManager.isInformationLevel(getShortName(), ternary); - holder.registerProblem(informationLevel ? ternary : ternary.getCondition(), + holder.registerProblem(ternary.getCondition(), "Can be replaced with Optional.ofNullable()", mayChangeSemantics ? ProblemHighlightType.INFORMATION : ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new ReplaceConditionWithOptionalFix(mayChangeSemantics));