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-12002 Restore providing keywords arguments in calls related to Django models

Browse Source 
broken due to the recent update of KeywordArgumentCompletionUtil:
891c4bf405.

Namely, for classes with __init__ containing **kwarg, it's properly
passed to PyKeywordArgumentProviders. It broke down because reference in
a constructor call is resolved into both class and its constructor, but
only the type of the corresponding class is inferred. Also,
parameters of the actual function is used, not those supplied by
a type provider because the latter usually omit "self", and then
presense of **kwargs can be overlooked due to the way
KwArgParameterCollector handles them.
This commit is contained in:
Mikhail Golubev
2017-12-04 22:22:43 +03:00
parent dc3eeaebb0
commit ecdf0754a6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
+10 -7
View File
@@ -76,11 +76,15 @@ public class KeywordArgumentCompletionUtil {
}
ContainerUtil.addIfNotNull(result, parameter.getName());
}
PyFunction func = null;
if (type instanceof PyFunctionType) {
final PyFunction func = as(((PyFunctionType)type).getCallable(), PyFunction.class);
if (func != null) {
addKeywordArgumentVariantsForFunction(callSite, func, parameters, result, new HashSet<>(), context);
}
func = as(((PyFunctionType)type).getCallable(), PyFunction.class);
}
else if (type instanceof PyClassType) {
func = ((PyClassType)type).getPyClass().findInitOrNew(true, context);
}
if (func != null) {
addKeywordArgumentVariantsForFunction(callSite, func, result, new HashSet<>(), context);
}
}
}
@@ -95,7 +99,6 @@ public class KeywordArgumentCompletionUtil {
private static void addKeywordArgumentVariantsForFunction(@NotNull final PyCallExpression callExpr,
@NotNull final PyFunction function,
@NotNull final List<PyCallableParameter> parameters,
@NotNull final List<String> ret,
@NotNull final Set<PyCallable> visited,
@NotNull final TypeEvalContext context) {
@@ -107,7 +110,7 @@ public class KeywordArgumentCompletionUtil {
final KwArgParameterCollector collector = new KwArgParameterCollector(needSelf, ret);
StreamEx
.of(parameters)
.of(function.getParameters(context))
.map(PyCallableParameter::getParameter)
.nonNull()
.forEach(parameter -> parameter.accept(collector));
@@ -125,7 +128,7 @@ public class KeywordArgumentCompletionUtil {
final PyFunction superMethod = as(PySuperMethodsSearch.search(function, context).findFirst(), PyFunction.class);
if (superMethod != null) {
addKeywordArgumentVariantsForFunction(callExpr, superMethod, superMethod.getParameters(context), ret, visited, context);
addKeywordArgumentVariantsForFunction(callExpr, superMethod, ret, visited, context);
}
}
}