From 8e3e414a6645275c70845e2620105d431a9fd402 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 31 Oct 2013 20:32:35 +0100
Subject: [PATCH] verify argument list even if unable to resolve callee
 (PY-10351)

---
 .../psi/impl/CallArgumentsMappingImpl.java    | 73 ++++++++++++-------
 .../python/psi/impl/PyArgumentListImpl.java   |  9 ++-
 ...ameterWithDefaultAfterKeywordContainer2.py |  8 ++
 .../PyArgumentListInspectionTest.java         |  4 +
 4 files changed, 64 insertions(+), 30 deletions(-)
 create mode 100644 python/testData/inspections/PyArgumentListInspection/parameterWithDefaultAfterKeywordContainer2.py

diff --git a/python/src/com/jetbrains/python/psi/impl/CallArgumentsMappingImpl.java b/python/src/com/jetbrains/python/psi/impl/CallArgumentsMappingImpl.java
index 5ce309533d62..692ff0052b10 100644
--- a/python/src/com/jetbrains/python/psi/impl/CallArgumentsMappingImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/CallArgumentsMappingImpl.java
@@ -65,29 +65,9 @@ public class CallArgumentsMappingImpl implements CallArgumentsMapping {
   public void mapArguments(PyCallExpression.PyMarkedCallee resolved_callee, @NotNull TypeEvalContext context) {
     PyExpression[] arguments = myArgumentList.getArguments();
     myMarkedCallee = resolved_callee;
-    List<PyExpression> unmatched_args = new LinkedList<PyExpression>();
-    Collections.addAll(unmatched_args, arguments);
     final List<PyExpression> unmatched_subargs = new LinkedList<PyExpression>(); // unmatched nested arguments will go here
-    // detect starred args
-    for (PyExpression arg : arguments) {
-      if (arg instanceof PyStarArgument) {
-        PyStarArgument star_arg = (PyStarArgument)arg;
-        if (star_arg.isKeyword()) {
-          if (myKwdArg == null) myKwdArg = star_arg;
-          else {
-            markArgument(arg, ArgFlag.IS_DUP_KWD);
-            unmatched_args.remove(arg);
-          }
-        }
-        else {
-          if (myTupleArg == null) myTupleArg = star_arg;
-          else {
-            markArgument(arg, ArgFlag.IS_DUP_TUPLE);
-            unmatched_args.remove(arg);
-          }
-        }
-      }
-    }
+    List<PyExpression> unmatched_args = verifyArguments();
+
     final List<PyParameter> parameters = PyUtil.getParameters(myMarkedCallee.getCallable(), context);
     // prepare parameter slots
     Map<PyNamedParameter, PyExpression> slots = new LinkedHashMap<PyNamedParameter, PyExpression>();
@@ -181,7 +161,6 @@ public class CallArgumentsMappingImpl implements CallArgumentsMapping {
       markArgument(arg, ArgFlag.IS_UNMAPPED);
     }
 
-    markPastBoundPositionalArguments(arguments, positional_bound);
 
     boolean seen_named_args = false;
     // map named args to named params if possible
@@ -346,15 +325,53 @@ public class CallArgumentsMappingImpl implements CallArgumentsMapping {
     }
   }
 
-  private void markPastBoundPositionalArguments(PyExpression[] arguments, int positionalBound) {
+  public List<PyExpression> verifyArguments() {
+    List<PyExpression> unmatched_args = new LinkedList<PyExpression>();
+    Collections.addAll(unmatched_args, myArgumentList.getArguments());
+    // detect starred args
+    for (PyExpression arg : myArgumentList.getArguments()) {
+      if (arg instanceof PyStarArgument) {
+        PyStarArgument star_arg = (PyStarArgument)arg;
+        if (star_arg.isKeyword()) {
+          if (myKwdArg == null) myKwdArg = star_arg;
+          else {
+            markArgument(arg, ArgFlag.IS_DUP_KWD);
+            unmatched_args.remove(arg);
+          }
+        }
+        else {
+          if (myTupleArg == null) myTupleArg = star_arg;
+          else {
+            markArgument(arg, ArgFlag.IS_DUP_TUPLE);
+            unmatched_args.remove(arg);
+          }
+        }
+      }
+    }
+
+    markPastBoundPositionalArguments(myArgumentList.getArguments());
+    return unmatched_args;
+  }
+
+  private void markPastBoundPositionalArguments(PyExpression[] arguments) {
     boolean seenKwArg = false;
-    for(int i=positionalBound; i<arguments.length; i++) {
-      PyExpression arg = arguments[i];
+    boolean seenKeyword = false;
+    boolean seenStar = false;
+    for (PyExpression arg : arguments) {
       if (arg == myKwdArg) {
         seenKwArg = true;
       }
-      if (!(arg instanceof PyStarArgument) && (seenKwArg || !(arg instanceof PyKeywordArgument))) {
-        markArgument(arg, ArgFlag.IS_POS_PAST_KWD);
+      else if (arg instanceof PyKeywordArgument) {
+        seenKeyword = true;
+      }
+      else if (arg instanceof PyStarArgument) {
+        seenStar = true;
+      }
+
+      if (seenKeyword || seenKwArg || seenStar) {
+        if (!(arg instanceof PyStarArgument) && (seenKwArg || !(arg instanceof PyKeywordArgument))) {
+          markArgument(arg, ArgFlag.IS_POS_PAST_KWD);
+        }
       }
     }
   }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyArgumentListImpl.java b/python/src/com/jetbrains/python/psi/impl/PyArgumentListImpl.java
index 49a52944c431..50ba5419070f 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyArgumentListImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyArgumentListImpl.java
@@ -269,8 +269,13 @@ public class PyArgumentListImpl extends PyElementImpl implements PyArgumentList
     // following the spec: http://docs.python.org/ref/calls.html
     PyCallExpression call = getCallExpression();
     if (call != null) {
-      PyCallExpression.PyMarkedCallee resolved_callee = call.resolveCallee(resolveContext, offset);
-      if (resolved_callee != null) ret.mapArguments(resolved_callee, resolveContext.getTypeEvalContext());
+      PyCallExpression.PyMarkedCallee resolvedCallee = call.resolveCallee(resolveContext, offset);
+      if (resolvedCallee != null) {
+        ret.mapArguments(resolvedCallee, resolveContext.getTypeEvalContext());
+      }
+      else {
+        ret.verifyArguments();
+      }
     }
     return ret;
   }
diff --git a/python/testData/inspections/PyArgumentListInspection/parameterWithDefaultAfterKeywordContainer2.py b/python/testData/inspections/PyArgumentListInspection/parameterWithDefaultAfterKeywordContainer2.py
new file mode 100644
index 000000000000..c4233c6004ee
--- /dev/null
+++ b/python/testData/inspections/PyArgumentListInspection/parameterWithDefaultAfterKeywordContainer2.py
@@ -0,0 +1,8 @@
+kwargs = {'foo': 'bar'}
+
+
+class Foo(object):
+
+    @classmethod
+    def test(cls):
+        cls(**kwargs, <error descr="Cannot appear past keyword arguments or *arg or **kwarg">foo=1</error>)
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyArgumentListInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyArgumentListInspectionTest.java
index 703b2ebbc9bd..fabba0c2458f 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyArgumentListInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyArgumentListInspectionTest.java
@@ -172,4 +172,8 @@ public class PyArgumentListInspectionTest extends PyTestCase {
   public void testParameterWithDefaultAfterKeywordContainer() {  // PY-9934
     doTest();
   }
+
+  public void testParameterWithDefaultAfterKeywordContainer2() {  // PY-10351
+    doTest();
+  }
 }