add additional project roots in resolve scope

diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
index bf83ef0cffb6b145bdb9780008dc51dc8e3da309..079c724ca98e111126f97855bd08829fba01bced 100644 (file)
--- a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
@@ -61,12 +61,13 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager {
       return scope;
     }
   };
-  private AdditionalIndexableFileSet myAdditionalIndexableFileSet = new AdditionalIndexableFileSet();
+  private final AdditionalIndexableFileSet myAdditionalIndexableFileSet;
 
   public ResolveScopeManagerImpl(Project project, ProjectRootManager projectRootManager, PsiManager psiManager) {
     myProject = project;
     myProjectRootManager = projectRootManager;
     myManager = psiManager;
+    myAdditionalIndexableFileSet = new AdditionalIndexableFileSet(project);
 
     ((PsiManagerImpl) psiManager).registerRunnableToRunOnChange(new Runnable() {
       @Override

diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java b/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
index 00df8c38367f82a417da1d33a9bcef0c6ae26aba..8b7ddf87fde1be6106786febfdc7341f7c4985d7 100644 (file)
--- a/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
+++ b/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
@@ -40,6 +40,10 @@ public class AdditionalIndexableFileSet implements IndexableFileSet {
     myExtensions = extensions;
   }
 
+  public AdditionalIndexableFileSet(Project project) {
+    myProject = project;
+  }
+
   public AdditionalIndexableFileSet(IndexedRootsProvider... extensions) {
     myProject = null;
     myExtensions = extensions;