PY-17052: support keywords arguments for any callable, not only functions

diff --git a/python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java b/python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
index 6a92bb1d16784e39341bff8f2f0473d20f303530..0019f3f6203b876b41aaf530399d1293ab8e1e78 100644 (file)
--- a/python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
+++ b/python/src/com/jetbrains/python/psi/impl/references/KeywordArgumentCompletionUtil.java
@@ -34,7 +34,7 @@ import java.util.HashSet;
 import java.util.List;
 
 public class KeywordArgumentCompletionUtil {
-  public static void collectFunctionArgNames(PyElement element, List<LookupElement> ret,  final @NotNull TypeEvalContext context) {
+  public static void collectFunctionArgNames(PyElement element, List<LookupElement> ret, @NotNull final TypeEvalContext context) {
     PyCallExpression callExpr = PsiTreeUtil.getParentOfType(element, PyCallExpression.class);
     if (callExpr != null) {
       PyExpression callee = callExpr.getCallee();
@@ -42,8 +42,8 @@ public class KeywordArgumentCompletionUtil {
         final PyResolveContext resolveContext = PyResolveContext.defaultContext().withTypeEvalContext(context);
         final QualifiedResolveResult result = ((PyReferenceExpression)callee).followAssignmentsChain(resolveContext);
         PsiElement def = result.getElement();
-        if (def instanceof PyFunction) {
-          addKeywordArgumentVariants((PyFunction)def, callExpr, ret);
+        if (def instanceof PyCallable) {
+          addKeywordArgumentVariants((PyCallable)def, callExpr, ret);
         }
         else if (def instanceof PyClass) {
           PyFunction init = ((PyClass)def).findMethodByName(PyNames.INIT, true);  // search in superclasses
@@ -55,46 +55,76 @@ public class KeywordArgumentCompletionUtil {
     }
   }
 
-  public static void addKeywordArgumentVariants(PyFunction def, PyCallExpression callExpr, final List<LookupElement> ret) {
-    addKeywordArgumentVariants(def, callExpr, ret, new HashSet<PyFunction>());
+  public static void addKeywordArgumentVariants(PyCallable callable, PyCallExpression callExpr, final List<LookupElement> ret) {
+    addKeywordArgumentVariants(callable, callExpr, ret, new HashSet<PyCallable>());
   }
 
-  public static void addKeywordArgumentVariants(PyFunction def, PyCallExpression callExpr, List<LookupElement> ret,
-                                                Collection<PyFunction> visited) {
-    if (visited.contains(def)) {
+  public static void addKeywordArgumentVariants(PyCallable callable, PyCallExpression callExpr, List<LookupElement> ret,
+                                                Collection<PyCallable> visited) {
+    if (visited.contains(callable)) {
       return;
     }
-    visited.add(def);
-    boolean needSelf = def.getContainingClass() != null && def.getModifier() != PyFunction.Modifier.STATICMETHOD;
+    visited.add(callable);
+
+    final TypeEvalContext context = TypeEvalContext.codeCompletion(callable.getProject(), callable.getContainingFile());
+    final List<PyParameter> parameters = PyUtil.getParameters(callable, context);
+
+    if (callable instanceof PyFunction) {
+      addKeywordArgumentVariantsForFunction(callExpr, ret, visited, (PyFunction)callable, parameters, context);
+    }
+    else {
+      addKeywordArgumentVariantsForCallable(callExpr, ret, parameters);
+    }
+
+  }
+
+  private static void addKeywordArgumentVariantsForCallable(@NotNull final PyCallExpression callExpr,
+                                                            @NotNull final List<LookupElement> ret,
+                                                            @NotNull final List<PyParameter> parameters) {
+    for (final PyParameter parameter : parameters) {
+      final String name = parameter.getName();
+      if (name != null && parameter.getAsNamed() != null) {
+        ret.add(PyUtil.createNamedParameterLookup(name, callExpr.getProject()));
+      }
+    }
+  }
+
+  private static void addKeywordArgumentVariantsForFunction(@NotNull final PyCallExpression callExpr,
+                                                            @NotNull final List<LookupElement> ret,
+                                                            @NotNull final Collection<PyCallable> visited,
+                                                            @NotNull final PyFunction function,
+                                                            @NotNull final List<PyParameter> parameters,
+                                                            @NotNull final TypeEvalContext context) {
+    boolean needSelf = function.getContainingClass() != null && function.getModifier() != PyFunction.Modifier.STATICMETHOD;
     final KwArgParameterCollector collector = new KwArgParameterCollector(needSelf, ret);
-    final TypeEvalContext context = TypeEvalContext.codeCompletion(def.getProject(), def.getContainingFile());
-    final List<PyParameter> parameters = PyUtil.getParameters(def, context);
+
+
     for (PyParameter parameter : parameters) {
       parameter.accept(collector);
     }
     if (collector.hasKwArgs()) {
       for (PyKeywordArgumentProvider provider : Extensions.getExtensions(PyKeywordArgumentProvider.EP_NAME)) {
-        final List<String> arguments = provider.getKeywordArguments(def, callExpr);
+        final List<String> arguments = provider.getKeywordArguments(function, callExpr);
         for (String argument : arguments) {
           ret.add(PyUtil.createNamedParameterLookup(argument, callExpr.getProject()));
         }
       }
       KwArgFromStatementCallCollector fromStatementCallCollector = new KwArgFromStatementCallCollector(ret, collector.getKwArgs());
-      final PyStatementList statementList = def.getStatementList();
-      if (statementList != null)
+      final PyStatementList statementList = function.getStatementList();
+      if (statementList != null) {
         statementList.acceptChildren(fromStatementCallCollector);
+      }
 
       //if (collector.hasOnlySelfAndKwArgs()) {
       // nothing interesting besides self and **kwargs, let's look at superclass (PY-778)
       if (fromStatementCallCollector.isKwArgsTransit()) {
 
-        final PsiElement superMethod = PySuperMethodsSearch.search(def, context).findFirst();
+        final PsiElement superMethod = PySuperMethodsSearch.search(function, context).findFirst();
         if (superMethod instanceof PyFunction) {
           addKeywordArgumentVariants((PyFunction)superMethod, callExpr, ret, visited);
         }
       }
     }
-//}
   }
 
   public static class KwArgParameterCollector extends PyElementVisitor {

diff --git a/python/testData/callableArguments/file.after b/python/testData/callableArguments/file.after
new file mode 100644 (file)
index 0000000..a78f0bc
--- /dev/null
+++ b/python/testData/callableArguments/file.after
@@ -0,0 +1,3 @@
+spam = lambda eggs: eggs
+
+spam(eggs=)

diff --git a/python/testData/callableArguments/file.py b/python/testData/callableArguments/file.py
new file mode 100644 (file)
index 0000000..257c2c7
--- /dev/null
+++ b/python/testData/callableArguments/file.py
@@ -0,0 +1,3 @@
+spam = lambda eggs: eggs
+
+spam(egg<caret>)