From fa5b649764e296d96417a4dc95bb2c1abf89ea7d Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 15 Feb 2017 11:55:28 +0100
Subject: [PATCH] resolve less references during groovy import optimization

---
 .../plugins/groovy/lang/psi/util/GroovyImportUtil.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java
index dd9d861a0e05..4f4308b55701 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyImportUtil.java
@@ -27,6 +27,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.imports.GrImportStatement;
+import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.packaging.GrPackageDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyImportHelper;
 import org.jetbrains.plugins.groovy.lang.resolve.processors.ClassHint;
@@ -54,13 +55,17 @@ public class GroovyImportUtil {
     file.accept(new PsiRecursiveElementWalkingVisitor() {
       @Override
       public void visitElement(PsiElement element) {
-        super.visitElement(element);
+        if (!(element instanceof GrImportStatement) && !(element instanceof GrPackageDefinition)) {
+          super.visitElement(element);
+        }
         if (element instanceof GrReferenceElement) {
           visitRefElement((GrReferenceElement)element);
         }
       }
 
       private void visitRefElement(GrReferenceElement refElement) {
+        if (refElement.isQualified()) return;
+
         final String refName = refElement.getReferenceName();
 
         if ("super".equals(refName)) return;