From 32bde283764d820817ea8b5e6d76472a5a59bb05 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Tue, 29 Aug 2017 16:37:52 +0300
Subject: [PATCH] fix nullability warnings in
 CreateFromUsageBaseFix#getTargetSubstitutor

---
 .../daemon/impl/quickfix/CreateFromUsageBaseFix.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
index 142bf3ebce8c..925390da9a22 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
@@ -253,11 +253,12 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
     return null;
   }
 
-  public static PsiSubstitutor getTargetSubstitutor (PsiElement element) {
+  @NotNull
+  public static PsiSubstitutor getTargetSubstitutor(@Nullable PsiElement element) {
     if (element instanceof PsiNewExpression) {
-      JavaResolveResult result = ((PsiNewExpression)element).getClassOrAnonymousClassReference().advancedResolve(false);
-      PsiSubstitutor substitutor = result.getSubstitutor();
-      return substitutor == null ? PsiSubstitutor.EMPTY : substitutor;
+      PsiJavaCodeReferenceElement reference = ((PsiNewExpression)element).getClassOrAnonymousClassReference();
+      JavaResolveResult result = reference == null ? JavaResolveResult.EMPTY : reference.advancedResolve(false);
+      return result.getSubstitutor();
     }
 
     PsiExpression qualifier = getQualifier(element);