From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Fri, 25 Mar 2016 11:52:55 +0000 (+0300)
Subject: reuse utility code to resolve CSS import references; improve the previous fix by... 
X-Git-Tag: appcode/146.847^0
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=91f58638ef904b2ecd63850f4394c6cbba5b645f

reuse utility code to resolve CSS import references; improve the previous fix by making it CSS-specific (WEB-20021, IDEA-CR-9576)
---

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
index 98e327097cf2..a79e85e91f4d 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
@@ -30,7 +30,6 @@ import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.PsiFileSystemItem;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.source.PsiFileImpl;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceHelper;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.CachedValueProvider;
@@ -182,35 +181,9 @@ public class FileIncludeManagerImpl extends FileIncludeManager {
       protected boolean useIncludingFileAsContext() {
         return false;
       }
-
-      @NotNull
-      @Override
-      public Collection<PsiFileSystemItem> computeDefaultContexts() {
-        Collection<PsiFileSystemItem> contexts = super.computeDefaultContexts();
-        if (!isAbsolutePathReference()) {
-          return addFileDirectoryToContexts(contexts, context);
-        }
-        return contexts;
-      }
     }.resolve();
   }
 
-  @NotNull
-  private static Collection<PsiFileSystemItem> addFileDirectoryToContexts(@NotNull Collection<PsiFileSystemItem> contexts,
-                                                                          @NotNull PsiFile context) {
-    VirtualFile file = context.getOriginalFile().getVirtualFile();
-    VirtualFile dir = file == null ? null : file.getParent();
-    if (dir != null) {
-      PsiFileSystemItem item = FileReferenceHelper.getPsiFileSystemItem(context.getManager(), dir);
-      if (item != null && !contexts.contains(item)) {
-        List<PsiFileSystemItem> result = ContainerUtil.newArrayList(contexts);
-        result.add(item);
-        return result;
-      }
-    }
-    return contexts;
-  }
-
   private abstract class IncludeCacheHolder {
 
     private final Key<ParameterizedCachedValue<VirtualFile[], PsiFile>> COMPILE_TIME_KEY;