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

Fix return value of QualifiedNameFinder#findShortestImportableName() in case of a cache hit

Browse Source 
It returned a string representation of the list of saved names
instead of the shorted qualified name itself.
This commit is contained in:
Mikhail Golubev
2017-04-17 19:22:54 +03:00
parent 2e008b6dda
commit bcb02af54c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java
+8 -9
View File
@@ -36,6 +36,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* @author yole
@@ -90,16 +91,14 @@ public class QualifiedNameFinder {
@Nullable
public static String findShortestImportableName(Module module, @NotNull VirtualFile vfile) {
final PythonPathCache cache = PythonModulePathCache.getInstance(module);
final List<QualifiedName> names = cache.getNames(vfile);
if (names != null) {
return names.toString();
List<QualifiedName> names = cache.getNames(vfile);
if (names == null) {
final PathChoosingVisitor visitor = new PathChoosingVisitor(vfile);
RootVisitorHost.visitRoots(module, false, visitor);
names = visitor.getResults();
cache.putNames(vfile, names);
}
PathChoosingVisitor visitor = new PathChoosingVisitor(vfile);
RootVisitorHost.visitRoots(module, false, visitor);
final List<QualifiedName> results = visitor.getResults();
cache.putNames(vfile, results);
final QualifiedName qName = shortestQName(results);
return qName == null ? null : qName.toString();
return Objects.toString(shortestQName(names), null);
}
/**