Fixed: (#2216)

1. On Mac OS, copy/paste/cut not working in grid cell edit mode
2. Cannot save modifications in grid cell edit mode via shortcut
3. On Windows, performing menu action "cut" in grid cell edit mode will raise exception
4. Typos in actiontriggers.py

Co-authored-by: Johnny Huang <[email protected]>

Author: jnhyperion

src/robotide/editor/clipboard.py

@@ -15,7 +15,7 @@
 
 import os
 import wx
-from robotide.context import IS_WINDOWS
+from robotide.context import IS_WINDOWS, IS_MAC
 
 
 class _ClipboardHandler(object):
@@ -100,13 +100,20 @@ def cut(self):
         if self._edit_control_shown():
             self._get_edit_control().Cut()
         else:
-            _ClipboardHandler.copy(self)
+            _ClipboardHandler.cut(self)
 
     def _paste_to_cell_editor(self):
         self._get_edit_control().Paste()
 
+    def paste(self):
+        if self._edit_control_shown():
+            self._paste_to_cell_editor()
+        else:
+            _ClipboardHandler.paste(self)
+
 
-ClipboardHandler = IS_WINDOWS and _WindowsClipboardHandler or _ClipboardHandler
+# for now mac clipboard handler is the same with windows
+ClipboardHandler = _WindowsClipboardHandler if IS_WINDOWS or IS_MAC else _ClipboardHandler
 
 
 class _GridClipboard(object):

src/robotide/editor/kweditor.py

@@ -27,7 +27,7 @@
     InsertArea
 from robotide.controller.cellinfo import TipMessage, ContentType, CellType
 from robotide.publish import (RideItemStepsChanged, RideSaved,
-                              RideSettingsChanged, PUBLISHER)
+                              RideSettingsChanged, PUBLISHER, RideBeforeSaving)
 from robotide.usages.UsageRunner import Usages, VariableUsages
 from robotide.ui.progress import RenameProgressObserver
 from robotide import robotapi, utils
@@ -103,6 +103,7 @@ def __init__(self, parent, controller, tree):
         self._counter = 0  # Workaround for double delete actions
         self._dcells = None  # Workaround for double delete actions
         self._icells = None  # Workaround for double insert actions
+        PUBLISHER.subscribe(self._before_saving, RideBeforeSaving)
         PUBLISHER.subscribe(self._data_changed, RideItemStepsChanged)
         PUBLISHER.subscribe(self.OnSettingsChanged, RideSettingsChanged)
         PUBLISHER.subscribe(self._resize_grid, RideSaved)
@@ -361,6 +362,14 @@ def _select_rows(self, rows):
     def OnMotion(self, event):
         pass
 
+    def _before_saving(self, data):
+        if self.IsCellEditControlShown():
+            # Fix: cannot save modifications in edit mode
+            # Exit edit mode before saving
+            self.HideCellEditControl()
+            self.SaveEditControlValue()
+            self.SetFocus()
+
     def _data_changed(self, data):
         if self._controller == data.item:
             self._write_steps(data.item)
@@ -437,18 +446,16 @@ def OnCut(self, event=None):
         self.OnDelete(event)
 
     def OnDelete(self, event=None):
-        _iscelleditcontrolshown = self.IsCellEditControlShown()
-        if _iscelleditcontrolshown:  # TODO Review if still needed
-            # On Windows, Delete key does not work in TextCtrl automatically
-            self.delete()
-        elif self.has_focus():
-            self._execute(ClearArea(self.selection.topleft,
-                                    self.selection.bottomright))
+        self._execute(ClearArea(self.selection.topleft,
+                                self.selection.bottomright))
         self._resize_grid()
 
     # DEBUG    @requires_focus
     def OnPaste(self, event=None):
-        self._execute_clipboard_command(PasteArea)
+        if self.IsCellEditControlShown():
+            self.paste()
+        else:
+            self._execute_clipboard_command(PasteArea)
         self._resize_grid()
 
     def _execute_clipboard_command(self, command_class):
@@ -487,6 +494,7 @@ def OnRedo(self, event=None):
     def close(self):
         self._colorizer.close()
         self.save()
+        PUBLISHER.unsubscribe(self._before_saving, RideBeforeSaving)
         PUBLISHER.unsubscribe(self._data_changed, RideItemStepsChanged)
         if self._namespace_updated:
             # Prevent re-entry to unregister method
@@ -942,11 +950,11 @@ def EndEdit(self, row, col, grid, *ignored):
     def ApplyEdit(self, row, col, grid):
         val = self._tc.GetValue()
         grid.GetTable().SetValue(row, col, val)  # update the table
-
         self._original_value = ''
         self._tc.SetValue('')
-        if self._value and val != '':  # DEBUG Fix #1967 crash when click other cell
-            self._grid.cell_value_edited(row, col, self._value)
+        # if self._value and val != '':  # DEBUG Fix #1967 crash when click other cell
+        # this will cause deleting all text in edit mode not working
+        self._grid.cell_value_edited(row, col, self._value)
 
     def _get_value(self):
         suggestion = self._tc.content_assist_value()

src/robotide/publish/messages.py

@@ -237,6 +237,11 @@ class RideSaving(RideMessage):
     data = ['path', 'datafile']
 
 
+class RideBeforeSaving(RideMessage):
+    """Sent before files are going to be saved."""
+    pass
+
+
 class RideSaved(RideMessage):
     """Sent after the file has been actually saved to disk."""
     data = ['path']

src/robotide/ui/actiontriggers.py

@@ -131,8 +131,8 @@ def _get_name(self, action, build_new):
         return '%s' % get_name(action.name)
 
     def _create_menu_item(self, action):
-        name_with_accerelator = self._get_name(action, build_new=True)
-        menu_item = MenuItem(self._frame, self, name_with_accerelator)
+        name_with_accelerator = self._get_name(action, build_new=True)
+        menu_item = MenuItem(self._frame, self, name_with_accelerator)
         pos = action.get_insertion_index(self.wx_menu)
         wx_menu_item = self.wx_menu.Insert(pos, menu_item.id,
                                            menu_item.name, action.doc)
@@ -282,15 +282,15 @@ def register(self, action):
                                                  action.shortcut))
             delegator.add(action)
             action.register(self)
-            self._update_accerelator_table()
+            self._update_accelerator_table()
 
     def unregister(self, action):
         key = action.get_shortcut()
         if self._actions[key].remove(action):
             del(self._actions[key])
-        self._update_accerelator_table()
+        self._update_accelerator_table()
 
-    def _update_accerelator_table(self):
+    def _update_accelerator_table(self):
         accelerators = []
         for delegator in self._actions.values():
             try:

src/robotide/ui/mainframe.py

@@ -22,7 +22,7 @@
 from robotide.context import ABOUT_RIDE, SHORTCUT_KEYS
 from robotide.controller.ctrlcommands import SaveFile, SaveAll
 from robotide.publish import RideSaveAll, RideClosing, RideSaved, PUBLISHER,\
-    RideInputValidationError, RideTreeSelection, RideModificationPrevented
+    RideInputValidationError, RideTreeSelection, RideModificationPrevented, RideBeforeSaving
 from robotide.ui.tagdialogs import ViewAllTagsDialog
 from robotide.ui.filedialogs import RobotFilePathDialog
 from robotide.utils import RideEventHandler
@@ -475,9 +475,11 @@ def OnOpenDirectory(self, event):
                 self.open_suite(path)
 
     def OnSave(self, event):
+        RideBeforeSaving().publish()
         self.save()
 
     def OnSaveAll(self, event):
+        RideBeforeSaving().publish()
         self.save_all()
 
     def save_all(self):