Fixed varargs and kwargs typing information

Author: aaltat

atest/DynamicTypesAnnotationsLibrary.py

@@ -111,5 +111,7 @@ def keyword_self_and_types(self: 'DynamicTypesAnnotationsLibrary', mandatory: st
         return True
 
     @keyword
-    def keyword_self_and_keyword_only_types(x: 'DynamicTypesAnnotationsLibrary', mandatory, *varargs: int, other: bool, **kwargs: Dict[str, int]):
-        return True
+    def keyword_self_and_keyword_only_types(x: 'DynamicTypesAnnotationsLibrary', mandatory, *varargs: int, other: bool,
+                                            **kwargs: int):
+        return (f'{mandatory}: {type(mandatory)}, {varargs}: {type(varargs)}, '
+                f'{other}: {type(other)}, {kwargs}: {type(kwargs)}')

atest/tests_types.robot

@@ -62,6 +62,16 @@ Keyword Only Arguments Without VarArg
     ${return} =    DynamicTypesAnnotationsLibrary.Keyword Only Arguments No Vararg    other=tidii
     Should Match    ${return}    tidii: <class 'str'>
 
+Varargs and KeywordArgs With Typing Hints
+    [Tags]    py3
+    ${return} =    DynamicTypesAnnotationsLibrary.Keyword Self And Keyword Only Types
+    ...    this_is_mandatory    # mandatory argument
+    ...    1    2    3     4    # varargs
+    ...    other=True                 # other argument
+    ...    key1=1    key2=2     # kwargs
+    Should Match     ${return}
+    ...    this_is_mandatory: <class 'str'>, (1, 2, 3, 4): <class 'tuple'>, True: <class 'bool'>, {'key1': 1, 'key2': 2}: <class 'dict'>
+
 *** Keywords ***
 Import DynamicTypesAnnotationsLibrary In Python 3 Only
     ${py3} =    DynamicTypesLibrary.Is Python 3

src/robotlibcore.py

@@ -232,12 +232,6 @@ def get_typing_hints(self):
             # remove return and self statements
             if arg not in self:
                 hints.pop(arg)
-            if self.varargs and arg in self.varargs:
-                hints['*%s' % arg] = hints[arg]
-                del hints[arg]
-            if self.kwargs and arg in self.kwargs:
-                hints['**%s' % arg] = hints[arg]
-                del hints[arg]
         return hints
 
     def _format_positional(self, positional, defaults):

utest/test_get_keyword_types.py

@@ -210,4 +210,4 @@ def test_keyword_self_and_types(lib_types):
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_self_and_keyword_only_types(lib_types):
     types = lib_types.get_keyword_types('keyword_self_and_keyword_only_types')
-    assert types == {'*varargs': int, 'other': bool, '**kwargs': Dict[str, int]}
+    assert types == {'varargs': int, 'other': bool, 'kwargs': int}