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

fix docstrings with evaluator stuff

Browse Source
This commit is contained in:
Dave Halter
2013-12-25 18:31:42 +01:00
parent d86f180d2e
commit f039bc3fc9
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/docstrings.py
View File

@@ -111,6 +111,8 @@ def find_return_types(evaluator, func):
if match: if match:
return match.group(1) return match.group(1)
from jedi.evaluate import representation as er
if isinstance(func, er.InstanceElement): if isinstance(func, er.InstanceElement):
func = func.var func = func.var
@@ -125,4 +127,4 @@ def find_return_types(evaluator, func):
if p.user_stmt is None: if p.user_stmt is None:
return [] return []
p.user_stmt.parent = func p.user_stmt.parent = func
return list(evaluate.follow_statement(p.user_stmt)) return list(evaluator.follow_statement(p.user_stmt))

4
jedi/evaluate/__init__.py
View File

@@ -255,12 +255,10 @@ class Evaluator(object):
r = func.var.params[r.position_nr] r = func.var.params[r.position_nr]
# add docstring knowledge # add docstring knowledge
""" doc_params = docstrings.follow_param(self, r)
doc_params = docstrings.follow_param(r) TODO ENABLE
if doc_params: if doc_params:
res_new += doc_params res_new += doc_params
continue continue
"""
if not r.is_generated: if not r.is_generated:
res_new += dynamic.search_params(self, r) res_new += dynamic.search_params(self, r)

5
jedi/evaluate/representation.py
View File

@@ -508,10 +508,7 @@ class Execution(Executable):
if func.is_generator and not evaluate_generator: if func.is_generator and not evaluate_generator:
return [Generator(self._evaluator, func, self.var_args)] return [Generator(self._evaluator, func, self.var_args)]
else: else:
""" stmts = docstrings.find_return_types(self._evaluator, func)
stmts = docstrings.find_return_types(func)
"""
stmts=[]
for r in self.returns: for r in self.returns:
if r is not None: if r is not None:
stmts += self._evaluator.follow_statement(r) stmts += self._evaluator.follow_statement(r)