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

Resolve in files that have no directly associated module (e.g. in stdlib)

Browse Source
This commit is contained in:
Dmitry Cheryasov
2008-05-23 17:03:18 +04:00
parent 77f021b8f5
commit efbc5c7b4e
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/ResolveImportUtil.java
+26 -11
View File
@@ -63,20 +63,35 @@ public class ResolveImportUtil {
}
final Module module = ModuleUtil.findModuleForPsiElement(importRef);
if (module == null) return null;
if (module != null) {
RootPolicy<PsiElement> resolvePolicy = new RootPolicy<PsiElement>() {
public PsiElement visitModuleSourceOrderEntry(final ModuleSourceOrderEntry moduleOrderEntry, final PsiElement value) {
if (value != null) return value;
return resolveInRoots(moduleOrderEntry.getRootModel().getContentRoots(), referencedName, importRef);
}
RootPolicy<PsiElement> resolvePolicy = new RootPolicy<PsiElement>() {
public PsiElement visitModuleSourceOrderEntry(final ModuleSourceOrderEntry moduleOrderEntry, final PsiElement value) {
if (value != null) return value;
return resolveInRoots(moduleOrderEntry.getRootModel().getContentRoots(), referencedName, importRef);
public PsiElement visitJdkOrderEntry(final JdkOrderEntry jdkOrderEntry, final PsiElement value) {
if (value != null) return value;
return resolveInRoots(jdkOrderEntry.getRootFiles(OrderRootType.SOURCES), referencedName, importRef);
}
};
return ModuleRootManager.getInstance(module).processOrder(resolvePolicy, null);
}
else {
try {
for (OrderEntry entry: ProjectRootManager.getInstance(importRef.getProject()).getFileIndex().getOrderEntriesForFile(
importRef.getContainingFile().getVirtualFile()
)
) {
PsiElement elt = resolveInRoots(entry.getFiles(OrderRootType.CLASSES), referencedName, importRef);
if (elt != null) return elt;
}
}
public PsiElement visitJdkOrderEntry(final JdkOrderEntry jdkOrderEntry, final PsiElement value) {
if (value != null) return value;
return resolveInRoots(jdkOrderEntry.getRootFiles(OrderRootType.SOURCES), referencedName, importRef);
catch (NullPointerException ex) {
return null;
}
};
return ModuleRootManager.getInstance(module).processOrder(resolvePolicy, null);
}
return null; // normally unreachable
}
@Nullable