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

PY-18816 Simplify stream of stub-safe resolve of qualified names

Browse Source
This commit is contained in:
Mikhail Golubev
2017-07-19 19:28:31 +03:00
parent a84963397f
commit 1580b82b92
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/resolve/PyResolveUtil.java
+7 -9
View File
@@ -28,6 +28,7 @@ import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.psi.types.PyClassLikeType;
import com.jetbrains.python.psi.types.PyType;
import com.jetbrains.python.psi.types.TypeEvalContext;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
@@ -37,8 +38,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static com.jetbrains.python.psi.PyUtil.as;
/**
* @author vlan
*
@@ -164,19 +163,18 @@ public class PyResolveUtil {
initialResults = StreamEx.of(unqualifiedResults);
}
final List<String> remainingNames = qualifiedName.removeHead(1).getComponents();
final StreamEx<RatedResolveResult> result = StreamEx.of(remainingNames).reduce(initialResults, (prev, name) ->
final StreamEx<RatedResolveResult> result = StreamEx.of(remainingNames).foldLeft(initialResults, (prev, name) ->
prev
.map(RatedResolveResult::getElement)
.map(elem -> as(elem, PyTypedElement.class))
.nonNull()
.select(PyTypedElement.class)
.map(context::getType)
.nonNull()
.map(type -> type instanceof PyClassLikeType ? ((PyClassLikeType)type).toInstance() : type)
.flatMap(elemType -> {
.flatMap(type -> {
final PyType instanceType = type instanceof PyClassLikeType ? ((PyClassLikeType)type).toInstance() : type;
final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(context);
final List<? extends RatedResolveResult> results = elemType.resolveMember(name, null, AccessDirection.READ, resolveContext);
final List<? extends RatedResolveResult> results = instanceType.resolveMember(name, null, AccessDirection.READ, resolveContext);
return results != null ? StreamEx.of(results) : StreamEx.<RatedResolveResult>empty();
}), (oldResults, newResults) -> newResults);
}));
return PyUtil.filterTopPriorityResults(result.toArray(RatedResolveResult[]::new));
}
}