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

Fix: Nested flows user scope detection was wrong.

Browse Source
This commit is contained in:
Dave Halter
2015-11-25 21:36:17 +01:00
parent 17ab7bbc3d
commit 9dbfb90c20
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/api/__init__.py
View File

@@ -301,7 +301,7 @@ class Script(object):
return [] return []
scopes = [i] scopes = [i]
else: else:
# just parse one statement, take it and evaluate it # Just parse one statement, take it and evaluate it.
eval_stmt = self._get_under_cursor_stmt(goto_path) eval_stmt = self._get_under_cursor_stmt(goto_path)
if eval_stmt is None: if eval_stmt is None:
return [] return []

5
jedi/parser/user_context.py
View File

@@ -325,11 +325,10 @@ class UserContextParser(object):
for s in scope.children: for s in scope.children:
if s.start_pos <= self._position <= s.end_pos: if s.start_pos <= self._position <= s.end_pos:
if isinstance(s, (tree.Scope, tree.Flow)): if isinstance(s, (tree.Scope, tree.Flow)):
if isinstance(s, tree.Flow): return scan(s) or s
return s
return scan(s) or s
elif s.type in ('suite', 'decorated'): elif s.type in ('suite', 'decorated'):
return scan(s) return scan(s)
return None
return scan(self.module()) or self.module() return scan(self.module()) or self.module()
else: else: