do not suggest value local value resources

diff --git a/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java b/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
index b720cce15aa41e29c9b66456da2b5dc407145000..1d65b487c475071f13fdb51c0ba047a2d5404285 100644 (file)
--- a/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
+++ b/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
@@ -188,7 +188,7 @@ public abstract class ResourceManager {
   }
 
   @NotNull
-  private Set<VirtualFile> getAllResourceFiles() {
+  protected Set<VirtualFile> getAllResourceFiles() {
     final Set<VirtualFile> files = new HashSet<VirtualFile>();
 
     for (VirtualFile valueResourceDir : getResourceSubdirs("values")) {

diff --git a/plugins/android/src/org/jetbrains/android/resourceManagers/SystemResourceManager.java b/plugins/android/src/org/jetbrains/android/resourceManagers/SystemResourceManager.java
index 43147141ebf56f391214f1331df7e9f701f04280..a0aa3d098be882e5da918f893dc2c916c6674b39 100644 (file)
--- a/plugins/android/src/org/jetbrains/android/resourceManagers/SystemResourceManager.java
+++ b/plugins/android/src/org/jetbrains/android/resourceManagers/SystemResourceManager.java
@@ -82,14 +82,36 @@ public class SystemResourceManager extends ResourceManager {
       LOG.error("Unknown resource type " + resourceType);
       return Collections.emptyList();
     }
-    final Set<String> result = new HashSet<String>();
+
+    final FileBasedIndex index = FileBasedIndex.getInstance();
     final ResourceEntry typeMarkerEntry = AndroidValueResourcesIndex.createTypeMarkerEntry(resourceType);
-    final List<Set<ResourceEntry>> values = FileBasedIndex.getInstance()
-      .getValues(AndroidValueResourcesIndex.INDEX_ID, typeMarkerEntry, GlobalSearchScope.moduleWithLibrariesScope(myModule));
+    final GlobalSearchScope scope = GlobalSearchScope.allScope(myModule.getProject());
+    
+    final Map<VirtualFile, Set<ResourceEntry>> file2resourceSet = new HashMap<VirtualFile, Set<ResourceEntry>>();
 
-    for (Set<ResourceEntry> entrySet : values) {
+    for (Set<ResourceEntry> entrySet : index.getValues(AndroidValueResourcesIndex.INDEX_ID, typeMarkerEntry, scope)) {
       for (ResourceEntry entry : entrySet) {
-        result.add(entry.getName());
+        final Collection<VirtualFile> files = index.getContainingFiles(AndroidValueResourcesIndex.INDEX_ID, entry, scope);
+
+        for (VirtualFile file : files) {
+          Set<ResourceEntry> resourcesInFile = file2resourceSet.get(file);
+          
+          if (resourcesInFile == null) {
+            resourcesInFile = new HashSet<ResourceEntry>();
+            file2resourceSet.put(file, resourcesInFile);
+          }
+          resourcesInFile.add(entry);
+        }
+      }
+    }
+    final Set<String> result = new HashSet<String>();
+    final Set<VirtualFile> resourceFiles = getAllResourceFiles();
+
+    for (Map.Entry<VirtualFile, Set<ResourceEntry>> entry : file2resourceSet.entrySet()) {
+      if (resourceFiles.contains(entry.getKey())) {
+        for (ResourceEntry resourceEntry : entry.getValue()) {
+          result.add(resourceEntry.getName());
+        }
       }
     }
     return result;
@@ -159,8 +181,7 @@ public class SystemResourceManager extends ResourceManager {
 
     final Collection<VirtualFile> files = FileBasedIndex.getInstance()
       .getContainingFiles(AndroidValueResourcesIndex.INDEX_ID, new ResourceEntry(resourceType, resourceName),
-                          GlobalSearchScope.moduleWithLibrariesScope(
-                            myModule));
+                          GlobalSearchScope.allScope(myModule.getProject()));
 
     if (files.size() == 0) {
       return Collections.emptyList();