ProjectAndLibrariesScope now allows changing display name (in AppCode "Libraries...

diff --git a/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java b/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java
index 9217e15d7987e2a18dae95973bca43b32efa02aa..1f3cf14317bb7bacfedea4495d7dbc2051592b85 100644 (file)
--- a/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java
@@ -28,6 +28,7 @@ import java.util.List;
 public class ProjectAndLibrariesScope extends GlobalSearchScope {
   protected final ProjectFileIndex myProjectFileIndex;
   protected final boolean mySearchOutsideRootModel;
+  private String myDisplayName = PsiBundle.message("psi.search.scope.project.and.libraries");
 
   public ProjectAndLibrariesScope(Project project) {
     this(project, false);
@@ -88,7 +89,11 @@ public class ProjectAndLibrariesScope extends GlobalSearchScope {
 
   @NotNull
   public String getDisplayName() {
-    return PsiBundle.message("psi.search.scope.project.and.libraries");
+    return myDisplayName;
+  }
+
+  public void setDisplayName(@NotNull String displayName) {
+    myDisplayName = displayName;
   }
 
   @NotNull
@@ -97,7 +102,6 @@ public class ProjectAndLibrariesScope extends GlobalSearchScope {
       return super.intersectWith(scope);
     }
 
-
     return scope;
   }
 

diff --git a/platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java b/platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java
index 60fd53095dae9ebf8f0d3f37e03b7c34d55afe03..b586bf60901aa21cb3129a44c68bb3f0fc582890 100644 (file)
--- a/platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/search/ProjectScopeBuilderImpl.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiBundle;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -38,7 +39,7 @@ public class ProjectScopeBuilderImpl extends ProjectScopeBuilder {
   @NotNull
   @Override
   public GlobalSearchScope buildLibrariesScope() {
-    return new ProjectAndLibrariesScope(myProject) {
+    ProjectAndLibrariesScope result = new ProjectAndLibrariesScope(myProject) {
       @Override
       public boolean contains(@NotNull VirtualFile file) {
         return myProjectFileIndex.isInLibrarySource(file) || myProjectFileIndex.isInLibraryClasses(file);
@@ -49,6 +50,8 @@ public class ProjectScopeBuilderImpl extends ProjectScopeBuilder {
         return false;
       }
     };
+    result.setDisplayName(PsiBundle.message("psi.search.scope.libraries"));
+    return result;
   }
 
   @NotNull
@@ -65,7 +68,7 @@ public class ProjectScopeBuilderImpl extends ProjectScopeBuilder {
 
     return new ProjectAndLibrariesScope(myProject, searchOutsideRootModel);
   }
-
+  
   @NotNull
   @Override
   public GlobalSearchScope buildProjectScope() {

diff --git a/platform/platform-resources-en/src/messages/PsiBundle.properties b/platform/platform-resources-en/src/messages/PsiBundle.properties
index 34a531c58defeee4bac515e4f5222dc7cae57c4d..0af4c52841eeb91b97cf2a587cca13fb13b83faa 100644 (file)
--- a/platform/platform-resources-en/src/messages/PsiBundle.properties
+++ b/platform/platform-resources-en/src/messages/PsiBundle.properties
@@ -6,6 +6,7 @@ psi.search.for.word.progress=Searching for {0}...
 psi.search.in.non.java.files.progress=Analyzing non-code usages...
 
 psi.search.scope.project.and.libraries=Project and Libraries
+psi.search.scope.libraries=Libraries
 psi.search.scope.project=Project Files
 psi.search.scope.production.files=Project Production Files
 psi.search.scope.test.files=Project Test Files