VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix for default arguments in combination with named arguments.

Browse Source
This commit is contained in:
Dave Halter
2014-10-25 13:14:01 +02:00
parent 7532f52cdd
commit afbdf1a7ea
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/evaluate/param.py
View File

@@ -228,10 +228,7 @@ def get_params(evaluator, func, var_args):
else: else:
if param.default is not None: if param.default is not None:
# No value: Return the default values. # No value: Return the default values.
has_default_value = True values = [param.default]
result.append(param.get_name())
# TODO is this allowed? it changes it long time.
param.is_generated = True
else: else:
# No value: Return an empty container # No value: Return an empty container
values = [] values = []
@@ -255,10 +252,12 @@ def get_params(evaluator, func, var_args):
# there's nothing to find for certain names. # there's nothing to find for certain names.
for k in set(param_dict) - keys_used: for k in set(param_dict) - keys_used:
param = param_dict[k] param = param_dict[k]
result.append(_gen_param_name_copy(evaluator, func, var_args, param)) values = [] if param.default is None else [param.default]
result.append(_gen_param_name_copy(evaluator, func, var_args,
param, values))
if not (non_matching_keys or had_multiple_value_error if not (non_matching_keys or had_multiple_value_error
or param.stars or param.assignment_details): or param.stars or param.default):
# add a warning only if there's not another one. # add a warning only if there's not another one.
calling_va = _get_calling_var_args(evaluator, var_args) calling_va = _get_calling_var_args(evaluator, var_args)
if calling_va is not None: if calling_va is not None: