small paste events may contain <Ctrl-a>like events

thomasballinger · thomasballinger · commit fa08b7400d50 · 2015-12-11T10:55:32.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -84,6 +84,9 @@
 Press {config.edit_config_key} to edit this config file.
 """
 EXAMPLE_CONFIG_URL = 'https://raw.githubusercontent.com/bpython/bpython/master/bpython/sample-config'
+MAX_EVENTS_POSSIBLY_NOT_PASTE = 20  # more than this many events will be assumed to
+                                    # be a true paste event, i.e. control characters
+                                    # like '<Ctrl-a>' will be stripped
 
 # This is needed for is_nop and should be removed once is_nop is fixed.
 if py3:
@@ -545,16 +548,25 @@ def process_control_event(self, e):
             ctrl_char = compress_paste_event(e)
             if ctrl_char is not None:
                 return self.process_event(ctrl_char)
-            simple_events = just_simple_events(e.events)
-            source = preprocess(''.join(simple_events),
-                                self.interp.compile)
-
             with self.in_paste_mode():
-                for ee in source:
-                    if self.stdin.has_focus:
-                        self.stdin.process_event(ee)
-                    else:
-                        self.process_simple_keypress(ee)
+                # Might not really be a paste, UI might just be lagging
+                if (len(e.events) <= MAX_EVENTS_POSSIBLY_NOT_PASTE and
+                        any(not is_simple_event(ee) for ee in e.events)):
+                    for ee in e.events:
+                        if self.stdin.has_focus:
+                            self.stdin.process_event(ee)
+                        else:
+                            self.process_event(ee)
+                else:
+                    simple_events = just_simple_events(e.events)
+                    source = preprocess(''.join(simple_events),
+                                        self.interp.compile)
+                    for ee in source:
+                        if self.stdin.has_focus:
+                            self.stdin.process_event(ee)
+                        else:
+                            self.process_simple_keypress(ee)
+
 
         elif isinstance(e, bpythonevents.RunStartupFileEvent):
             try:
@@ -1611,11 +1623,24 @@ def just_simple_events(event_list):
             pass  # ignore events
         elif e == '<SPACE>':
             simple_events.append(' ')
+        elif len(e) > 1:
+            pass  # get rid of <Ctrl-a> etc.
         else:
             simple_events.append(e)
     return simple_events
 
 
+def is_simple_event(e):
+    if isinstance(e, events.Event):
+        return False
+    if e in ("<Ctrl-j>", "<Ctrl-m>", "<PADENTER>", "\n", "\r", "<SPACE>"):
+        return True
+    if len(e) > 1:
+        return False
+    else:
+        return True
+
+
 # TODO this needs some work to function again and be useful for embedding
 def simple_repl():
     refreshes = []
diff --git a/bpython/test/test_curtsies.py b/bpython/test/test_curtsies.py
@@ -49,15 +49,15 @@ def tick(self, dt=1):
 
 class TestCurtsiesPasteDetection(TestCase):
     def test_paste_threshold(self):
-        inputs = combined_events(EventGenerator(list('abc')))
-        cb = combined_events(inputs, paste_threshold=3)
+        eg = EventGenerator(list('abc'))
+        cb = combined_events(eg, paste_threshold=3)
         e = next(cb)
         self.assertIsInstance(e, curtsies.events.PasteEvent)
         self.assertEqual(e.events, list('abc'))
         self.assertEqual(next(cb), None)
 
-        inputs = combined_events(EventGenerator(list('abc')))
-        cb = combined_events(inputs, paste_threshold=4)
+        eg = EventGenerator(list('abc'))
+        cb = combined_events(eg, paste_threshold=4)
         self.assertEqual(next(cb), 'a')
         self.assertEqual(next(cb), 'b')
         self.assertEqual(next(cb), 'c')
@@ -67,8 +67,7 @@ def test_set_timeout(self):
         eg = EventGenerator('a', zip('bcdefg', [1, 2, 3, 3, 3, 4]))
         eg.schedule_event(curtsies.events.SigIntEvent(), 5)
         eg.schedule_event('h', 6)
-        inputs = combined_events(eg)
-        cb = combined_events(inputs, paste_threshold=3)
+        cb = combined_events(eg, paste_threshold=3)
         self.assertEqual(next(cb), 'a')
         self.assertEqual(cb.send(0), None)
         self.assertEqual(next(cb), 'b')
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -20,6 +20,8 @@
 from bpython.test import (FixLanguageTestCase as TestCase, MagicIterMock, mock,
                           builtin_target, unittest)
 
+from curtsies import events
+
 
 def setup_config(conf):
     config_struct = config.Struct()
@@ -402,5 +404,29 @@ def test_startup_event_latin1(self):
         self.assertIn('a', self.repl.interp.locals)
 
 
+class TestCurtsiesPasteEvents(TestCase):
+
+    def setUp(self):
+        self.repl = create_repl()
+
+    def test_control_events_in_small_paste(self):
+        self.assertGreaterEqual(curtsiesrepl.MAX_EVENTS_POSSIBLY_NOT_PASTE, 6,
+                                'test assumes UI lag could cause 6 events')
+        p = events.PasteEvent()
+        p.events = ['a', 'b', 'c', 'd', '<Ctrl-a>', 'e']
+        self.repl.process_event(p)
+        self.assertEqual(self.repl.current_line, 'eabcd')
+
+
+    def test_control_events_in_large_paste(self):
+        """Large paste events should ignore control characters"""
+        p = events.PasteEvent()
+        p.events = (['a', '<Ctrl-a>'] +
+                    ['e'] * curtsiesrepl.MAX_EVENTS_POSSIBLY_NOT_PASTE)
+        self.repl.process_event(p)
+        self.assertEqual(self.repl.current_line,
+                         'a' + 'e'*curtsiesrepl.MAX_EVENTS_POSSIBLY_NOT_PASTE)
+
+
 if __name__ == '__main__':
     unittest.main()
