factor out checking if buffer could be complete and is valid

thomasballinger · thomasballinger · commit 695ba7c3a7bc · 2014-08-06T11:33:23.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -594,11 +594,8 @@ def push(self, line, insert_into_history=True):
         code_to_run = '\n'.join(self.buffer)
 
         logger.debug('running %r in interpreter', self.buffer)
-        try:
-            c = bool(code.compile_command('\n'.join(self.buffer)))
-            self.saved_predicted_parse_error = False
-        except (ValueError, SyntaxError, OverflowError):
-            c = self.saved_predicted_parse_error = True
+        c, code_will_parse = self.buffer_finished_will_parse()
+        self.saved_predicted_parse_error = not code_will_parse
         if c:
             logger.debug('finished - buffer cleared')
             self.display_lines.extend(self.display_buffer_lines)
@@ -609,6 +606,21 @@ def push(self, line, insert_into_history=True):
         self.coderunner.load_code(code_to_run)
         self.run_code_and_maybe_finish()
 
+    def buffer_finished_will_parse(self):
+        """Returns a tuple of whether the buffer could be complete and whether it will parse
+
+        True, True means code block is finished and no predicted parse error
+        True, False means code block is finished because a parse error is predicted
+        False, True means code block is unfinished
+        False, False isn't possible - an predicted error makes code block done"""
+        try:
+            finished = bool(code.compile_command('\n'.join(self.buffer)))
+            code_will_parse = True
+        except (ValueError, SyntaxError, OverflowError):
+            finished = True
+            code_will_parse = False
+        return finished, code_will_parse
+
     def run_code_and_maybe_finish(self, for_code=None):
         r = self.coderunner.run_code(for_code=for_code)
         if r:
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -0,0 +1,27 @@
+import unittest
+import sys
+py3 = (sys.version_info[0] == 3)
+
+from bpython.curtsiesfrontend import repl
+
+class TestCurtsiesRepl(unittest.TestCase):
+
+    def setUp(self):
+        self.repl = repl.Repl()
+
+    def test_buffer_finished_will_parse(self):
+        self.repl.buffer = ['1 + 1']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (True, True))
+        self.repl.buffer = ['def foo(x):']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (False, True))
+        self.repl.buffer = ['def foo(x)']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (True, False))
+        self.repl.buffer = ['def foo(x):', 'return 1']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (True, False))
+        self.repl.buffer = ['def foo(x):', '    return 1']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (True, True))
+        self.repl.buffer = ['def foo(x):', '    return 1', '']
+        self.assertTrue(self.repl.buffer_finished_will_parse(), (True, True))
+
+if __name__ == '__main__':
+    unittest.main()
