From 6ab207c197dbc4cc63a1220e2e58d48e600a1ed1 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 28 Jan 2020 18:33:17 +0700
Subject: [PATCH] isConflictingNameDeclaredInside: NPE fixed

GitOrigin-RevId: bfbe66f171b9a0e8c1ef7217b180c4ba54a9c993
---
 .../src/com/siyeh/ig/psiutils/InstanceOfUtils.java             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
index 84545648271b..13f366ff7584 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
@@ -240,7 +240,8 @@ public class InstanceOfUtils {
     return null;
   }
 
-  private static boolean isConflictingNameDeclaredInside(PsiIdentifier identifier, PsiElement statement) {
+  private static boolean isConflictingNameDeclaredInside(@Nullable PsiIdentifier identifier, @NotNull PsiElement statement) {
+    if (identifier == null) return false;
     class Visitor extends JavaRecursiveElementWalkingVisitor {
       boolean hasConflict = false;