🐛 fix

ArcletProject · Dec 25, 2023 · 382dcc0 · 382dcc0
1 parent 94deccf
commit 382dcc0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/arclet/alconna/_internal/_handlers.py b/src/arclet/alconna/_internal/_handlers.py
@@ -386,6 +386,7 @@ def analyse_param(analyser: SubAnalyser, argv: Argv, seps: tuple[str, ...] | Non
     if analyser.extra_allow:
         analyser.args_result.setdefault("$extra", []).append(_text)
         argv.next(seps, move=True)
+        return True
     return False
 
 

diff --git a/src/arclet/alconna/typing.py b/src/arclet/alconna/typing.py
@@ -111,12 +111,12 @@ def __calc_eq__(self, other):  # pragma: no cover
 AllParam = _AllParamPattern()
 
 
-class KeyWordVar(BasePattern[T]):
+class KeyWordVar(BasePattern[T, Any]):
     """对具名参数的包装"""
 
     base: BasePattern
 
-    def __init__(self, value: BasePattern[T] | type[T], sep: str = "="):
+    def __init__(self, value: BasePattern[T, Any] | type[T], sep: str = "="):
         """构建一个具名参数
 
         Args:
@@ -135,21 +135,21 @@ def __repr__(self):
 class _Kw:
     __slots__ = ()
 
-    def __getitem__(self, item: BasePattern[T] | type[T]):
+    def __getitem__(self, item: BasePattern[T, Any] | type[T]):
         return KeyWordVar(item)
 
     __matmul__ = __getitem__
     __rmatmul__ = __getitem__
 
 
-class MultiVar(BasePattern[T]):
+class MultiVar(BasePattern[T, Any]):
     """对可变参数的包装"""
 
-    base: BasePattern[T]
+    base: BasePattern[T, Any]
     flag: Literal["+", "*"]
     length: int
 
-    def __init__(self, value: BasePattern[T] | type[T], flag: int | Literal["+", "*"] = "+"):
+    def __init__(self, value: BasePattern[T, Any] | type[T], flag: int | Literal["+", "*"] = "+"):
         """构建一个可变参数
 
         Args:

diff --git a/tests/core_test.py b/tests/core_test.py
@@ -530,10 +530,10 @@ def test_help():
         assert cap["output"] == "[foo] <bar: str> \nFoo bar"
     with output_manager.capture("core17") as cap:
         alc17.parse("core17 --help baz")
-        assert cap["output"] == "baz <qux: str> \nBaz qux"
+        assert cap["output"] == "[baz] <qux: str> \nBaz qux"
     with output_manager.capture("core17") as cap:
         alc17.parse("core17 baz --help")
-        assert cap["output"] == "baz <qux: str> \nBaz qux"
+        assert cap["output"] == "[baz] <qux: str> \nBaz qux"
     with output_manager.capture("core17") as cap:
         alc17.parse("core17 add --help")
         assert cap["output"] == "add <bar: str> \nAdd bar"