VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 06:44:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more signature progress

Browse Source
This commit is contained in:
Dave Halter
2019-07-26 14:29:33 +02:00
parent 0703a69369
commit ba160e72ab
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
jedi/evaluate/signature.py
View File

@@ -102,10 +102,9 @@ class TreeSignature(AbstractSignature):
for param_name in kwarg_params: for param_name in kwarg_params:
for param_names in _iter_nodes_for_param(param_name, star_count=2): for param_names in _iter_nodes_for_param(param_name, star_count=2):
for p in param_names: for p in param_names:
if p.string_name not in used_names: if p.string_name not in used_names or p.get_kind() == Parameter.VAR_KEYWORD:
used_names.add(param_name.string_name) used_names.add(p.string_name)
yield p yield p
print(p)
def _iter_nodes_for_param(param_name, star_count): def _iter_nodes_for_param(param_name, star_count):
@@ -148,10 +147,10 @@ def _iter_nodes_for_param(param_name, star_count):
trailer=trailer, trailer=trailer,
) )
for c in contexts: for c in contexts:
yield _process_params( yield list(_process_params(
_remove_given_params(args, c.get_param_names()), _remove_given_params(args, c.get_param_names()),
star_count, star_count,
) ))
else: else:
assert False assert False
@@ -174,13 +173,32 @@ def _remove_given_params(arguments, param_names):
yield p yield p
def _process_params(param_names, star_count): def _process_params(param_names, star_count=3): # default means both * and **
used_names = set()
param_names = list(param_names)
for p in param_names: for p in param_names:
# TODO recurse on *args/**kwargs
if star_count == 1 and p.maybe_positional_argument(): if star_count == 1 and p.maybe_positional_argument():
yield ParamNameFixedKind(p, Parameter.POSITIONAL_ONLY) if p.get_kind() == Parameter.VAR_POSITIONAL:
yield p
else:
yield ParamNameFixedKind(p, Parameter.POSITIONAL_ONLY)
elif star_count == 2 and p.maybe_keyword_argument(): elif star_count == 2 and p.maybe_keyword_argument():
yield ParamNameFixedKind(p, Parameter.KEYWORD_ONLY) if p.get_kind() == Parameter.VAR_KEYWORD:
yield p
continue
itered = list(_iter_nodes_for_param(p, star_count=2))
if not itered:
# We were not able to resolve kwargs.
yield p
for param_names in itered:
for p in param_names:
if p.string_name not in used_names:
used_names.add(p.string_name)
yield p
else:
yield ParamNameFixedKind(p, Parameter.KEYWORD_ONLY)
elif star_count == 3:
yield p
class ParamNameFixedKind(ParamNameWrapper): class ParamNameFixedKind(ParamNameWrapper):

4
test/test_evaluate/test_signature.py
View File

@@ -100,10 +100,10 @@ def test_tree_signature(Script, environment, code, expected):
('combined_redirect(simple3, simple)', 'a, x: int, /, *, a, b, c'), ('combined_redirect(simple3, simple)', 'a, x: int, /, *, a, b, c'),
('combined_redirect(simple, kw)', 'a, b, /, *, a, b, c, **kwargs'), ('combined_redirect(simple, kw)', 'a, b, /, *, a, b, c, **kwargs'),
('combined_redirect(kw, simple)', 'a, b, /, *, a, b, c, **kwargs'), ('combined_redirect(kw, simple)', 'a, b, /, *, a, b, c'),
('combined_lot_of_args(kw, simple4)', '*, b'), ('combined_lot_of_args(kw, simple4)', '*, b'),
('combined_lot_of_args(simple4, kw)', '*, b, c'), ('combined_lot_of_args(simple4, kw)', '*, b, c, **kwargs'),
] ]
) )
def test_nested_signatures(Script, environment, combination, expected): def test_nested_signatures(Script, environment, combination, expected):