VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-03-02 11:56:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

if both docstring and annotations are present, use both for function parameters

Browse Source
This commit is contained in:
Claude
2015-12-13 23:55:07 +01:00
parent f8debace0d
commit 7f8b878c8c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/evaluate/finder.py
View File

@@ -388,15 +388,11 @@ def _eval_param(evaluator, param, scope):
and func.instance.is_generated and str(func.name) == '__init__':
param = func.var.params[param.position_nr]
# Add pep0484 type hints
# Add pep0484 and docstring knowledge.
pep0484_hints = pep0484.follow_param(evaluator, param)
if pep0484_hints:
return pep0484_hints
# Add docstring knowledge.
doc_params = docstrings.follow_param(evaluator, param)
if doc_params:
return doc_params
if pep0484_hints or doc_params:
return list(set(pep0484_hints) | set(doc_params))
if isinstance(param, ExecutedParam):
return res_new | param.eval(evaluator)