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

Some more small fixes

Browse Source
This commit is contained in:
Dave Halter
2019-07-28 18:09:08 +02:00
parent 97e7f608df
commit c8588191f9
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jedi/evaluate/star_args.py
View File

@@ -94,18 +94,19 @@ def _remove_given_params(arguments, param_names):
def process_params(param_names, star_count=3): # default means both * and ** def process_params(param_names, star_count=3): # default means both * and **
used_names = set() used_names = set()
kw_only_params = []
arg_funcs = [] arg_funcs = []
kwarg_funcs = [] kwarg_funcs = []
kw_only_names = []
kwarg_names = [] kwarg_names = []
longest_param_names = () arg_names = []
for p in param_names: for p in param_names:
kind = p.get_kind() kind = p.get_kind()
if kind == Parameter.VAR_POSITIONAL: if kind == Parameter.VAR_POSITIONAL:
if star_count & 1: if star_count & 1:
arg_funcs = list(_iter_nodes_for_param(p)) arg_funcs = list(_iter_nodes_for_param(p))
if not arg_funcs: if not arg_funcs:
yield p arg_names.append(p)
elif p.get_kind() == Parameter.VAR_KEYWORD: elif p.get_kind() == Parameter.VAR_KEYWORD:
if star_count & 2: if star_count & 2:
kwarg_funcs = list(_iter_nodes_for_param(p)) kwarg_funcs = list(_iter_nodes_for_param(p))
@@ -113,7 +114,7 @@ def process_params(param_names, star_count=3): # default means both * and **
kwarg_names.append(p) kwarg_names.append(p)
elif kind == Parameter.KEYWORD_ONLY: elif kind == Parameter.KEYWORD_ONLY:
if star_count & 2: if star_count & 2:
kw_only_params.append(p) kw_only_names.append(p)
elif kind == Parameter.POSITIONAL_ONLY: elif kind == Parameter.POSITIONAL_ONLY:
if star_count & 1: if star_count & 1:
yield p yield p
@@ -121,11 +122,12 @@ def process_params(param_names, star_count=3): # default means both * and **
if star_count == 1: if star_count == 1:
yield ParamNameFixedKind(p, Parameter.POSITIONAL_ONLY) yield ParamNameFixedKind(p, Parameter.POSITIONAL_ONLY)
elif star_count == 2: elif star_count == 2:
kw_only_params.append(ParamNameFixedKind(p, Parameter.KEYWORD_ONLY)) kw_only_names.append(ParamNameFixedKind(p, Parameter.KEYWORD_ONLY))
else: else:
used_names.add(p.string_name) used_names.add(p.string_name)
yield p yield p
longest_param_names = ()
for func_and_argument in arg_funcs: for func_and_argument in arg_funcs:
func, arguments = func_and_argument func, arguments = func_and_argument
new_star_count = star_count new_star_count = star_count
@@ -142,8 +144,10 @@ def process_params(param_names, star_count=3): # default means both * and **
)), new_star_count): )), new_star_count):
if p.get_kind() == Parameter.VAR_KEYWORD: if p.get_kind() == Parameter.VAR_KEYWORD:
kwarg_names.append(p) kwarg_names.append(p)
elif p.get_kind() == Parameter.VAR_POSITIONAL:
arg_names.append(p)
elif p.get_kind() == Parameter.KEYWORD_ONLY: elif p.get_kind() == Parameter.KEYWORD_ONLY:
kw_only_params.append(p) kw_only_names.append(p)
else: else:
args_for_this_func.append(p) args_for_this_func.append(p)
if len(args_for_this_func) > len(longest_param_names): if len(args_for_this_func) > len(longest_param_names):
@@ -157,7 +161,10 @@ def process_params(param_names, star_count=3): # default means both * and **
used_names.add(p.string_name) used_names.add(p.string_name)
yield p yield p
for p in kw_only_params: if arg_names:
yield arg_names[0]
for p in kw_only_names:
if p.string_name in used_names: if p.string_name in used_names:
continue continue
yield p yield p

5
test/test_evaluate/test_signature.py
View File

@@ -97,6 +97,9 @@ def test_tree_signature(Script, environment, code, expected):
('full_redirect(simple)', 'b, *, c'), ('full_redirect(simple)', 'b, *, c'),
('two_redirects(simple, simple)', 'a, b, *, c'), ('two_redirects(simple, simple)', 'a, b, *, c'),
('two_redirects(simple2, simple2)', 'x'),
('two_redirects(akw, kw)', 'a, c, *args, **kwargs'),
('two_redirects(kw, akw)', 'a, b, *args, c, **kwargs'),
('combined_redirect(simple, simple2)', 'a, b, /, *, x'), ('combined_redirect(simple, simple2)', 'a, b, /, *, x'),
('combined_redirect(simple, simple3)', 'a, b, /, *, a, x: int'), ('combined_redirect(simple, simple3)', 'a, b, /, *, a, x: int'),
@@ -130,7 +133,7 @@ def test_nested_signatures(Script, environment, combination, expected):
def simple5(y): ... def simple5(y): ...
def a(a, b, *args): ... def a(a, b, *args): ...
def kw(a, b, *, c, **kwargs): ... def kw(a, b, *, c, **kwargs): ...
def akw(a, b, *args, **kwargs): ... def akw(a, c, *args, **kwargs): ...
def no_redirect(func): def no_redirect(func):
return lambda *args, **kwargs: func(1) return lambda *args, **kwargs: func(1)