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-42772 Impl filtering positional only arguments

Browse Source 
GitOrigin-RevId: 978dd1f4970d5b1aaa94e251cbf81dee51f2f36c
This commit is contained in:
andrey.matveev
2020-06-08 10:11:19 +00:00
committed by intellij-monorepo-bot
parent 23b93e58f8
commit edbd512159
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-common-tests/com/jetbrains/python/PythonCommonCompletionTest.java
+15
View File
@@ -1841,6 +1841,21 @@ public abstract class PythonCommonCompletionTest extends PythonCommonTestCase {
);
}
// PY-42772
public void testNoPositionalOnlyArgumentsSuggestion() {
runWithLanguageLevel(
LanguageLevel.getLatest(),
() -> {
List<String> suggested = doTestByText("def foo(argument_1, /, argument_2):\n" +
" pass\n" +
"\n" +
"foo(<caret>)");
assertContainsElements(suggested, "argument_2=");
assertDoesntContain(suggested, "argument_1=");
}
);
}
private void doTestHasattrContributor(String[] inList, String[] notInList) {
doTestHasattrContributor("hasattrCompletion/" + getTestName(true) + ".py", inList, notInList);
}
python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
+11 -2
View File
@@ -59,7 +59,8 @@ public class KeywordArgumentCompletionUtil {
if (type.isCallable()) {
final List<PyCallableParameter> parameters = type.getParameters(context);
if (parameters != null) {
for (PyCallableParameter parameter : parameters) {
int indexOfPySlashParameter = getIndexOfPySlashParameter(parameters);
for (PyCallableParameter parameter : parameters.subList(indexOfPySlashParameter + 1, parameters.size())) {
if (parameter.isKeywordContainer() || parameter.isPositionalContainer()) {
continue;
}
@@ -86,6 +87,10 @@ public class KeywordArgumentCompletionUtil {
return result.getElement();
}
private static int getIndexOfPySlashParameter(@NotNull List<PyCallableParameter> parameters) {
return ContainerUtil.indexOf(parameters, parameter -> parameter.getParameter() instanceof PySlashParameter);
}
private static void addKeywordArgumentVariantsForFunction(@NotNull final PyCallExpression callExpr,
@NotNull final PyFunction function,
@NotNull final List<String> ret,
@@ -98,8 +103,12 @@ public class KeywordArgumentCompletionUtil {
boolean needSelf = function.getContainingClass() != null && function.getModifier() != PyFunction.Modifier.STATICMETHOD;
final KwArgParameterCollector collector = new KwArgParameterCollector(needSelf, ret);
List<PyCallableParameter> parameters = function.getParameters(context);
int indexOfPySlashParameter = getIndexOfPySlashParameter(parameters);
StreamEx
.of(function.getParameters(context))
.of(parameters)
.skip(indexOfPySlashParameter + 1)
.map(PyCallableParameter::getParameter)
.nonNull()
.forEach(parameter -> parameter.accept(collector));