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

flows in classes shouldn't be a problem anymore, fixes #183

Browse Source
This commit is contained in:
David Halter
2013-05-03 16:29:14 +04:30
parent fd4eb5f0a6
commit 1d45105461
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate.py
View File

@@ -315,6 +315,8 @@ def find_name(scope, name_str, position=None, search_global=False,
result = [] result = []
no_break_scope = False no_break_scope = False
par = name.parent par = name.parent
exc = pr.Class, pr.Function
until = lambda: par.parent.parent.get_parent_until(exc)
if par.isinstance(pr.Flow): if par.isinstance(pr.Flow):
if par.command == 'for': if par.command == 'for':
@@ -323,7 +325,7 @@ def find_name(scope, name_str, position=None, search_global=False,
debug.warning('Flow: Why are you here? %s' % par.command) debug.warning('Flow: Why are you here? %s' % par.command)
elif par.isinstance(pr.Param) \ elif par.isinstance(pr.Param) \
and par.parent is not None \ and par.parent is not None \
and par.parent.parent.isinstance(pr.Class) \ and isinstance(until(), pr.Class) \
and par.position_nr == 0: and par.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
@@ -332,7 +334,7 @@ def find_name(scope, name_str, position=None, search_global=False,
if isinstance(scope, er.InstanceElement): if isinstance(scope, er.InstanceElement):
inst = scope.instance inst = scope.instance
else: else:
inst = er.Instance(er.Class(par.parent.parent)) inst = er.Instance(er.Class(until()))
inst.is_generated = True inst.is_generated = True
result.append(inst) result.append(inst)
elif par.isinstance(pr.Statement): elif par.isinstance(pr.Statement):