Add more tests for text entry box controls

Author: MyreMylar

pygame_gui/elements/ui_text_entry_box.py

@@ -499,7 +499,7 @@ def _jump_edit_pos_to_start_of_word(self, should_select=False):
             text_to_search = self.html_text[max(0, self.edit_position-1)::-1]
             match_result = re.search(r'\b\w+\b', text_to_search)
             if match_result is not None:
-                next_pos = self.edit_position - match_result.regs[-1][1]
+                next_pos = max(self.edit_position - match_result.regs[-1][1], 0)
             else:
                 next_pos = self.edit_position
         except ValueError:
@@ -515,6 +515,7 @@ def _jump_edit_pos_to_start_of_word(self, should_select=False):
                     # extend left
                     self.select_range = [next_pos, self.select_range[1]]
             else:
+                next_pos = self.select_range[0]
                 self.select_range = [0, 0]
         else:
             if should_select:
@@ -528,7 +529,7 @@ def _jump_edit_pos_to_end_of_word(self, should_select=False):
         try:
             match_result = re.search(r'\b\w+\b', self.html_text[self.edit_position:])
             if match_result is not None:
-                next_pos = self.edit_position + match_result.regs[0][1]
+                next_pos = min(self.edit_position + match_result.regs[0][1], len(self.html_text))
             else:
                 next_pos = self.edit_position
         except ValueError:

tests/test_elements/test_ui_text_entry_box.py

@@ -1228,6 +1228,30 @@ def test_process_event_text_right_actually_move(self, _init_pygame: None,
         assert text_entry.select_range == [0, 3]
         assert text_entry.edit_position == 3
 
+        text_entry.set_text('dan dan')
+        text_entry.edit_position = 0
+        text_entry.select_range = [0, 0]
+        text_entry.focus()
+
+        text_entry.process_event(pygame.event.Event(pygame.KEYDOWN, {'key': pygame.K_RIGHT,
+                                                                     'mod': pygame.KMOD_CTRL | pygame.KMOD_SHIFT}))
+
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_RIGHT,
+                                                                           'mod': pygame.KMOD_CTRL | pygame.KMOD_SHIFT}))
+
+        assert processed_key_event
+        assert text_entry.select_range == [0, 7]
+        assert text_entry.edit_position == 7
+
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_RIGHT,
+                                                                           'mod': pygame.KMOD_CTRL}))
+
+        assert processed_key_event
+        assert text_entry.select_range == [0, 0]
+        assert text_entry.edit_position == 7
+
     def test_process_event_text_left(self, _init_pygame: None, default_ui_manager: UIManager,
                                      _display_surface_return_none: None):
         text_entry = UITextEntryBox(relative_rect=pygame.Rect(100, 100, 200, 30),
@@ -1294,6 +1318,30 @@ def test_process_event_text_left(self, _init_pygame: None, default_ui_manager: U
         assert text_entry.select_range == [0, 3]
         assert text_entry.edit_position == 0
 
+        text_entry.set_text('dan dan')
+        text_entry.edit_position = 7
+        text_entry.select_range = [0, 0]
+        text_entry.focus()
+
+        text_entry.process_event(pygame.event.Event(pygame.KEYDOWN, {'key': pygame.K_LEFT,
+                                                                     'mod': pygame.KMOD_CTRL | pygame.KMOD_SHIFT}))
+
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_LEFT,
+                                                                           'mod': pygame.KMOD_CTRL | pygame.KMOD_SHIFT}))
+
+        assert processed_key_event
+        assert text_entry.select_range == [0, 7]
+        assert text_entry.edit_position == 0
+
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_LEFT,
+                                                                           'mod': pygame.KMOD_CTRL}))
+
+        assert processed_key_event
+        assert text_entry.select_range == [0, 0]
+        assert text_entry.edit_position == 0
+
     def test_process_event_text_down(self, _init_pygame: None, default_ui_manager: UIManager,
                                      _display_surface_return_none: None):
         text_entry = UITextEntryBox(relative_rect=pygame.Rect(100, 100, 200, 30),
@@ -1323,6 +1371,13 @@ def test_process_event_text_down(self, _init_pygame: None, default_ui_manager: U
         assert text_entry.select_range == [3, 10]
         assert text_entry.edit_position == 10
 
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_DOWN,
+                                                                           'mod': 0}))
+        assert text_entry.select_range == [0, 0]
+        assert processed_key_event
+        assert text_entry.edit_position == 10
+
     def test_process_event_text_up(self, _init_pygame: None, default_ui_manager: UIManager,
                                    _display_surface_return_none: None):
         text_entry = UITextEntryBox(relative_rect=pygame.Rect(100, 100, 200, 30),
@@ -1352,6 +1407,14 @@ def test_process_event_text_up(self, _init_pygame: None, default_ui_manager: UIM
         assert text_entry.select_range == [3, 10]
         assert text_entry.edit_position == 3
 
+        processed_key_event = text_entry.process_event(pygame.event.Event(pygame.KEYDOWN,
+                                                                          {'key': pygame.K_UP,
+                                                                           'mod': 0}))
+
+        assert processed_key_event
+        assert text_entry.select_range == [0, 0]
+        assert text_entry.edit_position == 3
+
     def test_process_event_home(self, _init_pygame: None, default_ui_manager: UIManager,
                                 _display_surface_return_none: None):
         text_entry = UITextEntryBox(relative_rect=pygame.Rect(100, 100, 200, 30),