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

find imported files under jdk content roots

Browse Source
This commit is contained in:
Dmitry Jemerov
2008-03-07 15:42:51 +03:00
parent 26022c1807
commit ae32aa38f0
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/ResolveImportUtil.java
+32 -10
View File
@@ -2,7 +2,7 @@ package com.jetbrains.python.psi.impl;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
@@ -22,7 +22,7 @@ public class ResolveImportUtil {
@Nullable
static PsiElement resolveImportReference(final PyReferenceExpression importRef) {
String referencedName = importRef.getReferencedName();
final String referencedName = importRef.getReferencedName();
if (referencedName == null) return null;
final PyExpression qualifier = importRef.getQualifier();
@@ -48,19 +48,41 @@ public class ResolveImportUtil {
final Module module = ModuleUtil.findModuleForPsiElement(importRef);
if (module == null) return null;
final VirtualFile[] contentRoots = ModuleRootManager.getInstance(module).getContentRoots();
for(VirtualFile root: contentRoots) {
final VirtualFile childFile = root.findChild(referencedName + ".py");
if (childFile != null) {
return PsiManager.getInstance(importRef.getProject()).findFile(childFile);
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);
}
final VirtualFile childDir = root.findChild(referencedName);
if (childDir != null) {
return PsiManager.getInstance(importRef.getProject()).findDirectory(childDir);
public PsiElement visitJdkOrderEntry(final JdkOrderEntry jdkOrderEntry, final PsiElement value) {
if (value != null) return value;
return resolveInRoots(jdkOrderEntry.getRootFiles(OrderRootType.CLASSES), referencedName, importRef);
}
};
return ModuleRootManager.getInstance(module).processOrder(resolvePolicy, null);
}
@Nullable
private static PsiElement resolveInRoots(final VirtualFile[] roots, final String referencedName, final PyReferenceExpression importRef) {
for(VirtualFile contentRoot: roots) {
PsiElement result = resolveInRoot(contentRoot, referencedName, importRef);
if (result != null) return result;
}
return null;
}
@Nullable
private static PsiElement resolveInRoot(final VirtualFile root, final String referencedName, final PyReferenceExpression importRef) {
final VirtualFile childFile = root.findChild(referencedName + ".py");
if (childFile != null) {
return PsiManager.getInstance(importRef.getProject()).findFile(childFile);
}
final VirtualFile childDir = root.findChild(referencedName);
if (childDir != null) {
return PsiManager.getInstance(importRef.getProject()).findDirectory(childDir);
}
return null;
}