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

test fix: type is used for argument completion

Browse Source
This commit is contained in:
Ilya.Kazakevich
2015-11-09 20:33:00 +03:00
parent 4d220fd8df
commit 0654fd6d42
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
+26 -3
View File
@@ -28,6 +28,7 @@ import com.jetbrains.python.psi.resolve.QualifiedResolveResult;
import com.jetbrains.python.psi.search.PySuperMethodsSearch;
import com.jetbrains.python.psi.types.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,9 +41,13 @@ public class KeywordArgumentCompletionUtil {
if (callExpr != null) {
PyExpression callee = callExpr.getCallee();
if (callee instanceof PyReferenceExpression && element.getParent() == callExpr.getArgumentList()) {
final PyResolveContext resolveContext = PyResolveContext.defaultContext().withTypeEvalContext(context);
final QualifiedResolveResult result = ((PyReferenceExpression)callee).followAssignmentsChain(resolveContext);
PsiElement def = result.getElement();
PsiElement def = getElementByType(context, callee);
if (def == null) {
def = getElementByChain(context, (PyReferenceExpression)callee);
}
if (def instanceof PyCallable) {
addKeywordArgumentVariants((PyCallable)def, callExpr, ret);
}
@@ -61,6 +66,24 @@ public class KeywordArgumentCompletionUtil {
}
}
@Nullable
private static PyElement getElementByType(@NotNull final TypeEvalContext context, @NotNull final PyExpression callee) {
final PyType pyType = context.getType(callee);
if (pyType instanceof PyFunctionType) {
return ((PyFunctionType)pyType).getCallable();
}
if (pyType instanceof PyClassType) {
return ((PyClassType)pyType).getPyClass();
}
return null;
}
private static PsiElement getElementByChain(@NotNull TypeEvalContext context, PyReferenceExpression callee) {
final PyResolveContext resolveContext = PyResolveContext.defaultContext().withTypeEvalContext(context);
final QualifiedResolveResult result = callee.followAssignmentsChain(resolveContext);
return result.getElement();
}
private static void fetchCallablesFromUnion(@NotNull final List<LookupElement> ret,
@NotNull final PyCallExpression callExpr,
@NotNull final PyUnionType unionType,