fixup! Support positional and keyword-only arguments

Author: pganssle-google

mypy/stubdoc.py

@@ -262,6 +262,8 @@ def add_token(self, token: tokenize.TokenInfo) -> None:
                     self.keyword_only = len(self.args)
                     self.accumulator = ""
                 else:
+                    if self.accumulator.startswith("*"):
+                        self.keyword_only = len(self.args) + 1
                     self.arg_name = self.accumulator
                     if not (
                         token.string == ")" and self.accumulator.strip() == ""
@@ -301,7 +303,7 @@ def add_token(self, token: tokenize.TokenInfo) -> None:
             self.accumulator = ""
         elif (
             token.type == tokenize.OP
-            and (token.string in {"*", "/"})
+            and token.string == "/"
             and self.state[-1] == STATE_ARGUMENT_LIST
         ):
             if token.string == "/":
@@ -315,8 +317,6 @@ def add_token(self, token: tokenize.TokenInfo) -> None:
                 self.pos_only = len(self.args)
                 self.state.append(STATE_ARGUMENT_TYPE)
                 self.accumulator = ""
-            else:
-                self.accumulator = "*"
 
         elif token.type == tokenize.OP and token.string == "->" and self.state[-1] == STATE_INIT:
             self.accumulator = ""

mypy/test/teststubgen.py

@@ -421,6 +421,19 @@ def test_infer_sig_from_docstring_args_kwargs(self) -> None:
             [FunctionSig(name="func", args=[ArgSig(name="**kwargs")], ret_type="int")],
         )
 
+    @pytest.mark.xfail(
+        raises=AssertionError, reason="Arg and kwarg signature validation not implemented yet"
+    )
+    def test_infer_sig_from_docstring_args_kwargs_errors(self) -> None:
+        # Double args
+        assert_equal(infer_sig_from_docstring("func(*args, *args2) -> int", "func"), [])
+
+        # Double kwargs
+        assert_equal(infer_sig_from_docstring("func(**kw, **kw2) -> int", "func"), [])
+
+        # args after kwargs
+        assert_equal(infer_sig_from_docstring("func(**kwargs, *args) -> int", "func"), [])
+
     def test_infer_sig_from_docstring_positional_only_arguments(self) -> None:
         assert_equal(
             infer_sig_from_docstring("func(self, /) -> str", "func"),
@@ -441,6 +454,26 @@ def test_infer_sig_from_docstring_positional_only_arguments(self) -> None:
             [FunctionSig(name="func", args=[ArgSig(name="x"), ArgSig(name="y")], ret_type="int")],
         )
 
+        assert_equal(
+            infer_sig_from_docstring("func(x, /, *args) -> str", "func"),
+            [
+                FunctionSig(
+                    name="func", args=[ArgSig(name="x"), ArgSig(name="*args")], ret_type="str"
+                )
+            ],
+        )
+
+        assert_equal(
+            infer_sig_from_docstring("func(x, /, *, kwonly, **kwargs) -> str", "func"),
+            [
+                FunctionSig(
+                    name="func",
+                    args=[ArgSig(name="x"), ArgSig(name="kwonly"), ArgSig(name="**kwargs")],
+                    ret_type="str",
+                )
+            ],
+        )
+
     def test_infer_sig_from_docstring_keyword_only_arguments(self) -> None:
         assert_equal(
             infer_sig_from_docstring("func(*, x) -> str", "func"),
@@ -457,6 +490,17 @@ def test_infer_sig_from_docstring_keyword_only_arguments(self) -> None:
             [FunctionSig(name="func", args=[ArgSig(name="x"), ArgSig(name="y")], ret_type="str")],
         )
 
+        assert_equal(
+            infer_sig_from_docstring("func(x, *, kwonly, **kwargs) -> str", "func"),
+            [
+                FunctionSig(
+                    name="func",
+                    args=[ArgSig(name="x"), ArgSig(name="kwonly"), ArgSig("**kwargs")],
+                    ret_type="str",
+                )
+            ],
+        )
+
     def test_infer_sig_from_docstring_pos_only_and_keyword_only_arguments(self) -> None:
         assert_equal(
             infer_sig_from_docstring("func(x, /, *, y) -> str", "func"),
@@ -474,6 +518,22 @@ def test_infer_sig_from_docstring_pos_only_and_keyword_only_arguments(self) -> N
             ],
         )
 
+        assert_equal(
+            infer_sig_from_docstring("func(x,  /, y,  *, z, **kwargs) -> str", "func"),
+            [
+                FunctionSig(
+                    name="func",
+                    args=[
+                        ArgSig(name="x"),
+                        ArgSig(name="y"),
+                        ArgSig(name="z"),
+                        ArgSig("**kwargs"),
+                    ],
+                    ret_type="str",
+                )
+            ],
+        )
+
     def test_infer_sig_from_docstring_pos_only_and_keyword_only_arguments_errors(self) -> None:
         # / as first argument
         assert_equal(infer_sig_from_docstring("func(/, x) -> str", "func"), [])
@@ -494,6 +554,9 @@ def test_infer_sig_from_docstring_pos_only_and_keyword_only_arguments_errors(sel
 
         assert_equal(infer_sig_from_docstring("func(x, /, *, y, *,  z) -> str", "func"), [])
 
+        # *args and * are not allowed
+        assert_equal(infer_sig_from_docstring("func(*args, *, kwonly) -> str", "func"), [])
+
     def test_infer_arg_sig_from_anon_docstring(self) -> None:
         assert_equal(
             infer_arg_sig_from_anon_docstring("(*args, **kwargs)"),