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

EA-40890

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-01-07 18:45:49 +01:00
parent 0270be3a9b
commit db9caa15ce
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java
+16 -13
View File
@@ -129,11 +129,12 @@ public class QualifiedNameFinder {
*/
private static class PathChoosingVisitor implements RootVisitor {
@Nullable
private final VirtualFile myVFile;
private List<String> myResult;
private boolean myIsModuleSource;
private PathChoosingVisitor(VirtualFile file) {
private PathChoosingVisitor(@NotNull VirtualFile file) {
if (!file.isDirectory() && file.getName().equals(PyNames.INIT_DOT_PY)) {
myVFile = file.getParent();
}
@@ -143,20 +144,22 @@ public class QualifiedNameFinder {
}
public boolean visitRoot(VirtualFile root, Module module, Sdk sdk, boolean isModuleSource) {
final String relativePath = VfsUtilCore.getRelativePath(myVFile, root, '/');
if (relativePath != null) {
List<String> result = StringUtil.split(relativePath, "/");
if (myResult == null || result.size() < myResult.size() || (isModuleSource && !myIsModuleSource)) {
if (result.size() > 0) {
result.set(result.size() - 1, FileUtil.getNameWithoutExtension(result.get(result.size() - 1)));
}
for (String component : result) {
if (!PyNames.isIdentifier(component)) {
return true;
if (myVFile != null) {
final String relativePath = VfsUtilCore.getRelativePath(myVFile, root, '/');
if (relativePath != null) {
List<String> result = StringUtil.split(relativePath, "/");
if (myResult == null || result.size() < myResult.size() || (isModuleSource && !myIsModuleSource)) {
if (result.size() > 0) {
result.set(result.size() - 1, FileUtil.getNameWithoutExtension(result.get(result.size() - 1)));
}
for (String component : result) {
if (!PyNames.isIdentifier(component)) {
return true;
}
}
myResult = result;
myIsModuleSource = isModuleSource;
}
myResult = result;
myIsModuleSource = isModuleSource;
}
}
return myResult == null || myResult.size() > 0;