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

for out-of-project files, resolve imports from SDK selected for project

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-12-19 12:52:56 +03:00
parent 995897f096
commit da805a6121
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
+18 -2
View File
@@ -410,8 +410,24 @@ public class ResolveImportUtil {
if (elt_psifile != null) { // formality
final VirtualFile elt_vfile = elt_psifile.getVirtualFile();
if (elt_vfile != null) { // reality
for (OrderEntry entry : ProjectRootManager.getInstance(elt.getProject()).getFileIndex().getOrderEntriesForFile(elt_vfile)) {
if (!visitOrderEntryRoots(visitor, entry)) break;
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(elt.getProject()).getFileIndex();
final List<OrderEntry> orderEntries = fileIndex.getOrderEntriesForFile(elt_vfile);
if (orderEntries.size() > 0) {
for (OrderEntry entry : orderEntries) {
if (!visitOrderEntryRoots(visitor, entry)) break;
}
}
else {
// out-of-project file - use roots of SDK assigned to project
final Sdk sdk = PyBuiltinCache.findSdkForFile(elt_psifile);
if (sdk != null) {
final VirtualFile[] roots = sdk.getRootProvider().getFiles(OrderRootType.CLASSES);
for (VirtualFile root : roots) {
if (!visitor.visitRoot(root)) {
break;
}
}
}
}
}
}