From 3b73d7897087052b8a9e8569a790c0e9244beb19 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 3 Feb 2014 15:23:12 +0400
Subject: [PATCH] IDEA-119508 pass context PsiFile to ImportFilter

---
 .../daemon/impl/quickfix/ImportClassFixBase.java          | 3 ++-
 .../intellij/psi/impl/source/codeStyle/ImportHelper.java  | 2 +-
 .../src/com/intellij/codeInsight/ImportFilter.java        | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
index 510a79e4705a..957893ffe680 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
@@ -113,6 +113,7 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
     if (classes.length == 0) return Collections.emptyList();
     List<PsiClass> classList = new ArrayList<PsiClass>(classes.length);
     boolean isAnnotationReference = myElement.getParent() instanceof PsiAnnotation;
+    final PsiFile file = myElement.getContainingFile();
     for (PsiClass aClass : classes) {
       if (isAnnotationReference && !aClass.isAnnotationType()) continue;
       if (JavaCompletionUtil.isInExcludedPackage(aClass, false)) continue;
@@ -120,7 +121,7 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
       String qName = aClass.getQualifiedName();
       if (qName != null) { //filter local classes
         if (qName.indexOf('.') == -1) continue; //do not show classes from default package)
-        if (qName.endsWith(name) && ImportFilter.shouldImport(qName)) {
+        if (qName.endsWith(name) && ImportFilter.shouldImport(file, qName)) {
           if (isAccessible(aClass, myElement)) {
             classList.add(aClass);
           }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
index 852c7297de7f..9ade1c2a4495 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
@@ -370,7 +370,7 @@ public class ImportHelper{
     String className = refClass.getQualifiedName();
     if (className == null) return true;
 
-    if (!ImportFilter.shouldImport(className)) {
+    if (!ImportFilter.shouldImport(file, className)) {
       return false;
     }
     String packageName = getPackageOrClassName(className);
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/ImportFilter.java b/java/java-psi-api/src/com/intellij/codeInsight/ImportFilter.java
index 4863b8217dc8..a862c9d1e2ef 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/ImportFilter.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/ImportFilter.java
@@ -1,7 +1,9 @@
 package com.intellij.codeInsight;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
@@ -9,11 +11,11 @@ import org.jetbrains.annotations.NotNull;
 public abstract class ImportFilter {
   public static final ExtensionPointName<ImportFilter> EP_NAME = new ExtensionPointName<ImportFilter>("com.intellij.importFilter");
 
-  public abstract boolean shouldUseFullyQualifiedName(@NotNull String classQualifiedName);
+  public abstract boolean shouldUseFullyQualifiedName(@Nullable PsiFile targetFile, @NotNull String classQualifiedName);
 
-  public static boolean shouldImport(@NotNull String classQualifiedName) {
+  public static boolean shouldImport(@Nullable PsiFile targetFile, @NotNull String classQualifiedName) {
     for (ImportFilter filter : EP_NAME.getExtensions()) {
-      if (filter.shouldUseFullyQualifiedName(classQualifiedName)) {
+      if (filter.shouldUseFullyQualifiedName(targetFile, classQualifiedName)) {
         return false;
       }
     }