Fixed a few small things in the parser. Flow analysis is working again. Completely.

jedi/parser/representation.py

@@ -155,12 +155,14 @@ class Base(object):
             scope = scope.parent
         return scope
 
-    def get_parent_scope(self):
+    def get_parent_scope(self, include_flows=False):
         """
         Returns the underlying scope.
         """
         scope = self.parent
         while scope.parent is not None:
+            if include_flows and isinstance(scope, Flow):
+                return scope
             if scope.is_scope():
                 break
             scope = scope.parent
@@ -466,13 +468,17 @@ class Scope(Simple, DocstringMixin):
     def subscopes(self):
         return self._search_in_scope(Scope)
 
+    @property
+    def flows(self):
+        return self._search_in_scope(Flow)
+
     def _search_in_scope(self, typ):
         def scan(children):
             elements = []
             for element in children:
                 if isinstance(element, typ):
                     elements.append(element)
-                elif is_node(element, 'suite') or is_node(element, 'simple_stmt') \
+                if is_node(element, 'suite') or is_node(element, 'simple_stmt') \
                         or isinstance(element, Flow):
                     elements += scan(element.children)
             return elements

jedi/parser/user_context.py

@@ -7,7 +7,7 @@ from jedi import common
 from jedi.parser import tokenize
 from jedi._compatibility import u
 from jedi.parser.fast import FastParser
-from jedi.parser import representation
+from jedi.parser import representation as pr
 from jedi import debug
 from jedi.common import PushBackIterator
 
@@ -244,12 +244,17 @@ class UserContextParser(object):
 
     @cache.underscore_memoization
     def user_scope(self):
+        """
+        Returns the scope in which the user resides. This includes flows.
+        """
         user_stmt = self.user_stmt()
         if user_stmt is None:
             def scan(scope):
-                for s in scope.statements + scope.subscopes:
-                    if isinstance(s, representation.Scope):
+                for s in scope.subscopes + list(reversed(scope.flows)):
+                    if isinstance(s, (pr.Scope, pr.Flow)):
                         if s.start_pos <= self._position <= s.end_pos:
+                            if isinstance(s, pr.Flow):
+                                return s
                             return scan(s) or s
 
             return scan(self.module()) or self.module()