From 9dbfb90c202852862a3de1e85e2427d4acc2f03d Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 25 Nov 2015 21:36:17 +0100 Subject: [PATCH] Fix: Nested flows user scope detection was wrong. --- jedi/api/__init__.py | 2 +- jedi/parser/user_context.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 661f8a06..620e44f4 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -301,7 +301,7 @@ class Script(object): return [] scopes = [i] 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) if eval_stmt is None: return [] diff --git a/jedi/parser/user_context.py b/jedi/parser/user_context.py index 3cb24a7c..65049ad4 100644 --- a/jedi/parser/user_context.py +++ b/jedi/parser/user_context.py @@ -325,11 +325,10 @@ class UserContextParser(object): for s in scope.children: if s.start_pos <= self._position <= s.end_pos: if isinstance(s, (tree.Scope, tree.Flow)): - if isinstance(s, tree.Flow): - return s - return scan(s) or s + return scan(s) or s elif s.type in ('suite', 'decorated'): return scan(s) + return None return scan(self.module()) or self.module() else: