From 9c665ddce5c3e83b07190c0d6062ec35ddccda8b Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 20 Jan 2017 16:15:52 +0100
Subject: [PATCH] IPP: add GenericsUtil.getVariableTypeByExpressionType() call
 to be sure

---
 .../ipp/conditional/ReplaceConditionalWithIfIntention.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java
index f422742f999f..7ebf2442d015 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java
@@ -158,7 +158,7 @@ public class ReplaceConditionalWithIfIntention extends Intention {
                                         @Nullable PsiExpression replacementExpression, boolean insertCast, @NotNull StringBuilder out) {
     if (element.equals(elementToReplace)) {
       final String replacementText = (replacementExpression == null) ? "" : replacementExpression.getText();
-      final PsiType type = ExpectedTypeUtils.findExpectedType(elementToReplace, true);
+      final PsiType type = GenericsUtil.getVariableTypeByExpressionType(ExpectedTypeUtils.findExpectedType(elementToReplace, true));
       if (insertCast && type != null) {
         out.append('(').append(type.getCanonicalText()).append(')');
       }