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

prepare merging of some_method and remove_statement

Browse Source
This commit is contained in:
Dave Halter
2014-01-07 00:54:45 +01:00
parent bbc15d4349
commit d1a4eccf13
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jedi/evaluate/finder.py
View File

@@ -154,7 +154,7 @@ class NameFinder(object):
flow_scope = flow_scope.parent flow_scope = flow_scope.parent
for name in names: for name in names:
types += self._some_method(name) types += self._some_method(name.parent)
return self._remove_statements(types, resolve_decorator) return self._remove_statements(types, resolve_decorator)
@@ -239,25 +239,21 @@ class NameFinder(object):
debug.dbg('sfn remove, new: %s, old: %s' % (res_new, result)) debug.dbg('sfn remove, new: %s, old: %s' % (res_new, result))
return res_new return res_new
def _some_method(self, name): def _some_method(self, typ):
""" """
Returns the parent of a name, which means the element which stands Returns the parent of a name, which means the element which stands
behind a name. behind a name.
""" """
result = [] result = []
par = name.parent
exc = pr.Class, pr.Function exc = pr.Class, pr.Function
until = lambda: par.parent.parent.get_parent_until(exc) until = lambda: typ.parent.parent.get_parent_until(exc)
if par.isinstance(pr.Flow): if typ.isinstance(pr.ForFlow):
if par.command == 'for': result += self._handle_for_loops(typ)
result += self._handle_for_loops(par) elif typ.isinstance(pr.Param) \
else: and typ.parent is not None \
raise NotImplementedError("Shouldn't happen!")
elif par.isinstance(pr.Param) \
and par.parent is not None \
and isinstance(until(), pr.Class) \ and isinstance(until(), pr.Class) \
and par.position_nr == 0: and typ.position_nr == 0:
# This is where self gets added - this happens at another # This is where self gets added - this happens at another
# place, if the var_args are clear. But sometimes the class is # place, if the var_args are clear. But sometimes the class is
# not known. Therefore add a new instance for self. Otherwise # not known. Therefore add a new instance for self. Otherwise
@@ -268,8 +264,8 @@ class NameFinder(object):
for inst in self._evaluator.execute(er.Class(self._evaluator, until())): for inst in self._evaluator.execute(er.Class(self._evaluator, until())):
inst.is_generated = True inst.is_generated = True
result.append(inst) result.append(inst)
elif par is not None: elif typ is not None:
result.append(par) result.append(typ)
return result return result
def _handle_for_loops(self, loop): def _handle_for_loops(self, loop):