From 73ed3aa31163b92c3f679cc1e52dce73d0c221d3 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Thu, 30 May 2019 12:34:00 +0700 Subject: [PATCH] SwitchUtils#getSwitchSelectorExpression: make null-friendly GitOrigin-RevId: 8d10b8cd94c4cdda407c91c1f52377fbd50b55e1 --- .../src/com/siyeh/ig/psiutils/SwitchUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SwitchUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SwitchUtils.java index 4f8cd274af09..de9a57f9eff9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SwitchUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SwitchUtils.java @@ -22,8 +22,10 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; +import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.*; @@ -153,6 +155,8 @@ public class SwitchUtils { return false; } + @Contract("null -> null") + @Nullable public static PsiExpression getSwitchSelectorExpression(PsiExpression expression) { if (expression == null) return null; final LanguageLevel languageLevel = PsiUtil.getLanguageLevel(expression);