VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-20 07:19:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nicer _remove_statements

Browse Source
This commit is contained in:
Dave Halter
2014-01-07 13:25:30 +01:00
parent a3e4b209c7
commit 69afc2482a
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/finder.py
+9 -17
View File
@@ -211,20 +211,15 @@ class NameFinder(object):
res_new = [] res_new = []
func = r.parent func = r.parent
exc = pr.Class, pr.Function cls = func.parent.get_parent_until((pr.Class, pr.Function))
until = lambda: func.parent.get_parent_until(exc)
if func is not None \ if isinstance(cls, pr.Class) and r.position_nr == 0:
and isinstance(until(), pr.Class) \ # This is where we add self - if it has never been
and r.position_nr == 0: # instantiated.
# This is where self gets added - this happens at another place, if
# the var_args are clear. But sometimes the class is not known.
# Therefore add a new instance for self. Otherwise take the
# existing.
if isinstance(self.scope, er.InstanceElement): if isinstance(self.scope, er.InstanceElement):
res_new.append(self.scope.instance) res_new.append(self.scope.instance)
else: else:
for inst in self._evaluator.execute(er.Class(self._evaluator, until())): for inst in evaluator.execute(er.Class(evaluator, cls)):
inst.is_generated = True inst.is_generated = True
res_new.append(inst) res_new.append(inst)
return res_new return res_new
@@ -232,19 +227,16 @@ class NameFinder(object):
# Instances are typically faked, if the instance is not called from # Instances are typically faked, if the instance is not called from
# outside. Here we check it for __init__ functions and return. # outside. Here we check it for __init__ functions and return.
if isinstance(func, er.InstanceElement) \ if isinstance(func, er.InstanceElement) \
and func.instance.is_generated \ and func.instance.is_generated and str(func.name) == '__init__':
and hasattr(func, 'name') \
and str(func.name) == '__init__' \
and r.position_nr > 0: # 0 would be self
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(evaluator, r) doc_params = docstrings.follow_param(evaluator, r)
if doc_params: if doc_params:
res_new += doc_params return doc_params
return res_new
if not r.is_generated: if not r.is_generated:
# Param owns no information itself.
res_new += dynamic.search_params(evaluator, r) res_new += dynamic.search_params(evaluator, r)
if not res_new: if not res_new:
c = r.expression_list()[0] c = r.expression_list()[0]