From 52a581a6632d589168589ff3240f5aa58f4e364c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 4 Sep 2017 11:28:42 +0700 Subject: [PATCH] StreamChainInliner: PsiTypesUtil.getDefaultValue used --- .../dataFlow/inliner/StreamChainInliner.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inliner/StreamChainInliner.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inliner/StreamChainInliner.java index 92ef2ea75b89..14facf48367f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inliner/StreamChainInliner.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inliner/StreamChainInliner.java @@ -18,6 +18,7 @@ package com.intellij.codeInspection.dataFlow.inliner; import com.intellij.codeInspection.dataFlow.*; import com.intellij.codeInspection.dataFlow.value.DfaValue; import com.intellij.psi.*; +import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.ObjectUtils; @@ -195,16 +196,7 @@ public class StreamChainInliner implements CallInliner { @Override protected void pushInitialValue(CFGBuilder builder) { PsiType type = myCall.getType(); - Object value = null; - if (PsiType.INT.equals(type)) { - value = 0; - } - else if (PsiType.LONG.equals(type)) { - value = 0L; - } - else if (PsiType.DOUBLE.equals(type)) { - value = 0.0; - } + Object value = PsiTypesUtil.getDefaultValue(type); builder.push(builder.getFactory().getConstFactory().createFromValue(value, type, null)); }