MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-66154: Resources from Web Facets not autocompleted across transitive module dependencies

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-03-04 15:06:38 +03:00
parent f1a808c7bc
commit 19b8ba05ed
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/xml/index/ResourceRelevance.java
+16 -23
View File
@@ -18,14 +18,11 @@ package com.intellij.xml.index;
import com.intellij.javaee.ExternalResourceManager;
import com.intellij.javaee.ExternalResourceManagerImpl;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* @author Dmitry Avdeev
*/
@@ -37,32 +34,28 @@ public enum ResourceRelevance {
SOURCE,
MAPPED;
public static ResourceRelevance getRelevance(VirtualFile file, @Nullable Module module, ProjectFileIndex fileIndex) {
public static ResourceRelevance getRelevance(VirtualFile resource, @Nullable Module module, ProjectFileIndex fileIndex) {
boolean inTest = fileIndex.isInTestSourceContent(resource);
if (module != null) {
Module moduleForFile = fileIndex.getModuleForFile(file);
if (moduleForFile != null) { // in module content
return module.equals(moduleForFile) || ModuleManager.getInstance(module.getProject()).isModuleDependent(module, moduleForFile) ? SOURCE : NONE;
GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(inTest);
Module resourceModule = fileIndex.getModuleForFile(resource);
if (resourceModule != null &&
(resourceModule == module || scope.isSearchInModuleContent(resourceModule)) ||
scope.contains(resource)) {
return inTest || fileIndex.isInSource(resource) ? SOURCE : LIBRARY;
}
}
if (fileIndex.isInLibraryClasses(file)) {
List<OrderEntry> orderEntries = fileIndex.getOrderEntriesForFile(file);
if (orderEntries.isEmpty()) {
return NONE;
}
if (module != null) {
for (OrderEntry orderEntry : orderEntries) {
Module ownerModule = orderEntry.getOwnerModule();
if (ownerModule.equals(module)) {
return LIBRARY;
}
}
}
else if (inTest || fileIndex.isInSource(resource)) {
return SOURCE;
}
else if (fileIndex.isInLibraryClasses(resource)) {
return LIBRARY;
}
ExternalResourceManagerImpl resourceManager = (ExternalResourceManagerImpl)ExternalResourceManager.getInstance();
if (resourceManager.isUserResource(file)) {
if (resourceManager.isUserResource(resource)) {
return MAPPED;
}
if (ExternalResourceManagerImpl.isStandardResource(file)) {
if (ExternalResourceManagerImpl.isStandardResource(resource)) {
return STANDARD;
}
return NONE;