From 35671de4cf1cece433a3419cc1e634b3d1f391b6 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Mon, 26 Dec 2016 17:48:20 +0300
Subject: [PATCH] [groovy] fix NPE warning in static import method fix

---
 .../annotator/intentions/GroovyStaticImportMethodFix.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
index 478c7bdb25c4..4fc044d22195 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
@@ -165,16 +165,15 @@ public class GroovyStaticImportMethodFix extends Intention {
   private void doImport(final PsiMethod toImport) {
     CommandProcessor.getInstance().executeCommand(toImport.getProject(), () -> WriteAction.run(() -> {
       try {
-        GrMethodCall element = myMethodCall.getElement();
-        if (element != null) {
-          getMethodExpression(element).bindToElementViaStaticImport(toImport);
+        GrReferenceExpression expression = getMethodExpression();
+        if (expression != null) {
+          expression.bindToElementViaStaticImport(toImport);
         }
       }
       catch (IncorrectOperationException e) {
         LOG.error(e);
       }
     }), getText(), this);
-
   }
 
   private void chooseAndImport(Editor editor) {