From 0a537c05c42a8c0268f09c366dfe9df5e5bfd86b Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Thu, 29 Jan 2015 02:24:11 +0100
Subject: [PATCH] Fix an issue with Function/Flow combination in the fast
 parser.

---
 jedi/parser/fast.py                  |  8 +++++---
 test/test_parser/test_fast_parser.py | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jedi/parser/fast.py b/jedi/parser/fast.py
index 3a6ab5d5..12765272 100644
--- a/jedi/parser/fast.py
+++ b/jedi/parser/fast.py
@@ -542,6 +542,7 @@ class FastTokenizer(object):
             self._indent_counter += 1
         elif typ == DEDENT:
             self._indent_counter -= 1
+            print('DEDENT', self._flow_indent_counter, start_pos, self._indent_counter)
             if self._in_flow and self._indent_counter == self._flow_indent_counter:
                 self._in_flow = False
                 self._next_dedent_noclose = True
@@ -549,10 +550,11 @@ class FastTokenizer(object):
 
         if self.previous[0] in (NEWLINE, INDENT, DEDENT):
             if self.previous[0] == DEDENT:
-                if not self._next_dedent_noclose:
-                    self._first_stmt = False
-                    return self._close()
                 if not self._in_flow:
+                    if not self._next_dedent_noclose:
+                        self._first_stmt = False
+                        return self._close()
+
                     self._next_dedent_noclose = False
             # Check for NEWLINE, which symbolizes the indent.
             #print('X', repr(value), tokenize.tok_name[typ])
diff --git a/test/test_parser/test_fast_parser.py b/test/test_parser/test_fast_parser.py
index d7b9bc08..21d5772d 100644
--- a/test/test_parser/test_fast_parser.py
+++ b/test/test_parser/test_fast_parser.py
@@ -142,6 +142,20 @@ def test_for():
     check_fp(src, 1)
 
 
+def test_func_with_if():
+    src = dedent("""\
+    def recursion(a):
+        if foo:
+            return recursion(a)
+        else:
+            if bar:
+                return inexistent
+            else:
+                return a
+    """)
+    check_fp(src, 1)
+
+
 def test_incomplete_function():
     source = '''return ImportErr'''