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

Refactor user scope search.

Browse Source
This commit is contained in:
Dave Halter
2015-02-05 21:52:57 +01:00
parent 8125d5f562
commit a9a3387cb0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/parser/user_context.py
View File

@@ -289,12 +289,14 @@ class UserContextParser(object):
user_stmt = self.user_stmt() user_stmt = self.user_stmt()
if user_stmt is None: if user_stmt is None:
def scan(scope): def scan(scope):
for s in scope.subscopes + list(reversed(scope.flows)): for s in scope.children:
if isinstance(s, (pr.Scope, pr.Flow)): if s.start_pos <= self._position <= s.end_pos:
if s.start_pos <= self._position <= s.end_pos: if isinstance(s, (pr.Scope, pr.Flow)):
if isinstance(s, pr.Flow): if isinstance(s, pr.Flow):
return s return s
return scan(s) or s return scan(s) or s
elif s.type in ('suite', 'decorated'):
return scan(s)
return scan(self.module()) or self.module() return scan(self.module()) or self.module()
else: else: