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

cleanup; allow QualifiedNameResolver to work with only an SDK

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-08 11:42:24 +02:00
parent 46fee0c166
commit 01897c8ab2
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/QualifiedNameResolverImpl.java
+11 -12
View File
@@ -5,7 +5,7 @@ import com.google.common.collect.Sets;
import com.intellij.facet.FacetManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -58,7 +58,7 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
myFootholdFile = foothold.getContainingFile().getOriginalFile();
}
myPsiManager = foothold.getManager();
setModule(ModuleUtil.findModuleForPsiElement(foothold));
setModule(ModuleUtilCore.findModuleForPsiElement(foothold));
if (PydevConsoleRunner.isInPydevConsole(foothold)) {
withAllModules();
}
@@ -136,13 +136,13 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
if (!root.isValid()) {
return true;
}
PsiFileSystemItem resolveResult = resolveInRoot(root, sdk);
PsiFileSystemItem resolveResult = resolveInRoot(root);
if (resolveResult != null) {
results.add(resolveResult);
}
if (myAcceptRootAsTopLevelPackage && myQualifiedName.matchesPrefix(PyQualifiedName.fromDottedString(root.getName()))) {
resolveResult = resolveInRoot(root.getParent(), sdk);
resolveResult = resolveInRoot(root.getParent());
if (resolveResult != null) {
results.add(resolveResult);
}
@@ -165,8 +165,7 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
dir = ResolveImportUtil.stepBackFrom(myFootholdFile, myRelativeLevel);
}
PsiFileSystemItem module = resolveModuleAt(dir, null,
myModule != null ? null : PyBuiltinCache.findSdkForNonModuleFile(myFootholdFile));
PsiFileSystemItem module = resolveModuleAt(dir);
if (module != null) {
results.add(module);
}
@@ -203,6 +202,9 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
else if (myFootholdFile != null) {
RootVisitorHost.visitSdkRoots(myFootholdFile, this);
}
else if (myWithSdk != null) {
RootVisitorHost.visitSdkRoots(myWithSdk, this);
}
else {
throw new IllegalStateException();
}
@@ -263,24 +265,21 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
}
@Nullable
private PsiFileSystemItem resolveInRoot(VirtualFile root, Sdk sdk) {
private PsiFileSystemItem resolveInRoot(VirtualFile root) {
if (!root.isDirectory()) {
// if we have added a file as a root, it's unlikely that we'll be able to resolve anything under it in 'files only' resolve mode
return null;
}
return resolveModuleAt(myPsiManager.findDirectory(root), root, sdk);
return resolveModuleAt(myPsiManager.findDirectory(root));
}
/**
* Searches for a module at given directory, unwinding qualifiers and traversing directories as needed.
*
*
* @param directory where to start from; top qualifier will be searched for here.
* @param root an SDK, library or content root from which we're searching, or null if we're searching relatively
* @param sdk @return module's file, or null.
*/
@Nullable
private PsiFileSystemItem resolveModuleAt(@Nullable PsiDirectory directory, @Nullable VirtualFile root, Sdk sdk) {
private PsiFileSystemItem resolveModuleAt(@Nullable PsiDirectory directory) {
// prerequisites
if (directory == null || !directory.isValid()) return null;