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

Minor update in QualifiedNameFinder.PathChoosingVisitor (PY-30942)

Browse Source
This commit is contained in:
Semyon Proshev
2018-10-09 20:57:55 +03:00
parent 26bf28130e
commit 236d0f6bfd
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java
+11 -16
View File
@@ -22,9 +22,7 @@ import com.jetbrains.python.psi.impl.PyPsiUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* @author yole
@@ -197,12 +195,11 @@ public class QualifiedNameFinder {
}
/**
* Tries to find roots that contain given vfile, and among them the root that contains at the smallest depth.
* For equal depth source root is in preference to library.
* Tries to find roots that contain given vfile.
*/
private static class PathChoosingVisitor implements RootVisitor {
@Nullable private final VirtualFile myVFile;
@NotNull private final List<QualifiedName> myResults = new ArrayList<>();
@NotNull private final Set<QualifiedName> myResults = new LinkedHashSet<>();
private PathChoosingVisitor(@NotNull VirtualFile file) {
if (!file.isDirectory() && file.getName().equals(PyNames.INIT_DOT_PY)) {
@@ -214,23 +211,21 @@ public class QualifiedNameFinder {
}
@Override
public boolean visitRoot(VirtualFile root, Module module, Sdk sdk, boolean isModuleSource) {
public boolean visitRoot(@NotNull VirtualFile root, @Nullable Module module, @Nullable Sdk sdk, boolean isModuleSource) {
if (myVFile != null) {
final String relativePath = VfsUtilCore.getRelativePath(myVFile, root, '/');
if (relativePath != null && !relativePath.isEmpty()) {
List<String> result = StringUtil.split(relativePath, "/");
if (result.size() > 0) {
result.set(result.size() - 1, FileUtil.getNameWithoutExtension(result.get(result.size() - 1)));
if (!StringUtil.isEmpty(relativePath)) {
final List<String> result = StringUtil.split(relativePath, "/");
if (!result.isEmpty()) {
final int lastIndex = result.size() - 1;
result.set(lastIndex, FileUtil.getNameWithoutExtension(result.get(lastIndex)));
}
for (String component : result) {
if (!PyNames.isIdentifier(component)) {
return true;
}
}
final QualifiedName resQname = QualifiedName.fromComponents(result);
if (!myResults.contains(resQname)) {
myResults.add(resQname);
}
myResults.add(QualifiedName.fromComponents(result));
}
}
return true;
@@ -238,7 +233,7 @@ public class QualifiedNameFinder {
@NotNull
public List<QualifiedName> getResults() {
return myResults;
return new ArrayList<>(myResults);
}
}
}