Grid editor fixes (#1846)

* fix contents Assistant to restore original cell value after hitting ESC

* Wip fix win encoding (#1838)

* Adds DEBUG for encoding, Chinese test OK in Linux

* Fixed latin filenames or directories.

* WIP try to fix non-unicode tags in python 2.7

* WIP fix latin chars tags

* Clean up DEBUGs. All OK in Linux

* Runs OK with python3 on Windows with directories with chinese or latin chars

* fix bug when tooltip window from grid editor show on different tab after
switch

* improve contentassist handling

* improve keyword information showing (work on single crtl hodl +
hovering through grid cells) but the ctrl + m still persist

* remove debug log

* fix - pass RETURN key to contentAssist for selecting keyword from list

* fix idle event return -1 error in some cases (window destroy events should be always skipped to properly disable
all idle events / callLater events )

* fix contents Assistant to restore original cell value after hitting ESC

* fix bug when tooltip window from grid editor show on different tab after
switch

* improve contentassist handling

* improve keyword information showing (work on single crtl hodl +
hovering through grid cells) but the ctrl + m still persist

* remove debug log

* fix - pass RETURN key to contentAssist for selecting keyword from list

* fix idle event return -1 error in some cases (window destroy events should be always skipped to properly disable
all idle events / callLater events )

* fix non invokable content assist while editing cell in grid editor

Author: 2Eagle2

src/robotide/contrib/testrunner/testrunnerplugin.py

@@ -216,12 +216,13 @@ def disable(self):
         self.unsubscribe_all()
         self.unregister_actions()
 
-    def OnClose(self, evt):
+    def OnClose(self, event):
         """Shut down the running services and processes"""
         self._test_runner.kill_process()
         if self._process_timer:
             self._process_timer.Stop()
         self._test_runner.shutdown_server()
+        event.Skip()
 
     def OnAutoSaveCheckbox(self, evt):
         """Called when the user clicks on the "Auto Save" checkbox"""

src/robotide/editor/contentassist.py

@@ -49,32 +49,28 @@ def set_row(self, row):
     def OnChar(self, event):
         # TODO: This might benefit from some cleanup
         keycode, control_down = event.GetKeyCode(), event.CmdDown()
-        event.Skip()  # DEBUG do it as soon we do not need it
-        # print("DEBUG: Onchar before processing")
+        # print("DEBUG:  before processing" + str(keycode) + " + " +  str(control_down))
         # Ctrl-Space handling needed for dialogs # DEBUG add Ctrl-m
         if (control_down or event.AltDown()) and keycode in (wx.WXK_SPACE, ord('m')):
             self.show_content_assist()
-            return
-        if keycode in [wx.WXK_UP, wx.WXK_DOWN, wx.WXK_PAGEUP, wx.WXK_PAGEDOWN]\
+        elif keycode in [wx.WXK_UP, wx.WXK_DOWN, wx.WXK_PAGEUP, wx.WXK_PAGEDOWN]\
                 and self._popup.is_shown():
             self._popup.select_and_scroll(keycode)
-            return
         elif keycode == wx.WXK_RETURN and self._popup.is_shown():
             self.OnFocusLost(event)
-            return
         elif keycode == wx.WXK_TAB:
             self.OnFocusLost(event, False)
         elif keycode == wx.WXK_ESCAPE and self._popup.is_shown():
             self._popup.hide()
-            return
         elif self._popup.is_shown() and keycode < 256:
-            self._populate_content_assist(event)
+            wx.CallAfter(self._populate_content_assist)
+            event.Skip()
         elif keycode in (ord('1'), ord('2'), ord('5')) and event.ControlDown() and not \
                 event.AltDown():
             self.execute_variable_creator(list_variable=(keycode == ord('2')),
                                           dict_variable=(keycode == ord('5')))
-        # print("DEBUG: Onchar before leaving")
-        # event.Skip() # DEBUG Move up
+        else:
+            event.Skip()
 
     def execute_variable_creator(self, list_variable=False, dict_variable=False):
         from_, to_ = self.GetSelection()
@@ -99,9 +95,9 @@ def OnFocusLost(self, event, set_value=True):
             event.Skip()
             return
         if self.gherkin_prefix:
-            value = self.gherkin_prefix + self._popup.get_value() or ""
+            value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
         else:
-            value =self._popup.get_value() or ""
+            value = self._popup.get_value() or self.GetValue()
         if set_value and value:
             self.SetValue(value)
             self.SetInsertionPoint(len(value))  # DEBUG was self.Value
@@ -121,19 +117,8 @@ def show_content_assist(self):
         if self._populate_content_assist():
             self._show_content_assist()
 
-    def _populate_content_assist(self, event=None):
+    def _populate_content_assist(self):
         value = self.GetValue()
-        if event is not None:
-            if event.GetKeyCode() == wx.WXK_BACK:
-                value = value[:-1]
-            elif event.GetKeyCode() == wx.WXK_DELETE:
-                pos = self.GetInsertionPoint()
-                value = value[:pos] + value[pos + 1:]
-            elif event.GetKeyCode() == wx.WXK_ESCAPE:
-                self.hide()
-                return False
-            else:
-                value += unichr(event.GetRawKeyCode())
         (self.gherkin_prefix, value) = self._remove_bdd_prefix(value)
         return self._popup.content_assist_for(value, row=self._row)
 
@@ -386,6 +371,9 @@ def _select_and_scroll(self, selection):
         self._selection = selection
         self._list.Select(self._selection)
         self._list.EnsureVisible(self._selection)
+        value = self.get_value()
+        if value:
+            self._parent.SetValue(value)
 
     def hide(self):
         self._selection = -1

src/robotide/editor/kweditor.py

@@ -502,10 +502,11 @@ def OnKeyDown(self, event):
         _iscelleditcontrolshown = self.IsCellEditControlShown()
 
         keycode, control_down = event.GetKeyCode(), event.CmdDown()
-        event.Skip()  # DEBUG seen this skip as soon as possible
-        if keycode == ord('M') and \
-            (control_down or event.AltDown()):  #  keycode == wx.WXK_CONTROL
-            self._show_cell_information()
+        # print("DEBUG: key pressed " + str(keycode) + " + " +  str(control_down))
+        # event.Skip()  # DEBUG seen this skip as soon as possible
+        if keycode == wx.WXK_CONTROL or \
+                (keycode == ord('M') and (control_down or event.AltDown())):  #  keycode == wx.WXK_CONTROL
+            self.show_cell_information()
         elif keycode == ord('C') and control_down:
             # print("DEBUG: captured Control-C\n")
             self.OnCopy(event)
@@ -519,15 +520,18 @@ def OnKeyDown(self, event):
             self.OnSelectAll(event)
         elif event.AltDown() and keycode in [wx.WXK_DOWN, wx.WXK_UP]:
             self._move_rows(keycode)
+            event.Skip()
         elif event.AltDown() and keycode == wx.WXK_RETURN:
             self._move_cursor_down(event)
+            event.Skip()
         elif keycode == wx.WXK_WINDOWS_MENU:
             self.OnCellRightClick(event)
         elif keycode in [wx.WXK_RETURN, wx.WXK_BACK]:
             if not _iscelleditcontrolshown:
                 self._move_grid_cursor(event, keycode)
             else:
                 self.save()
+            event.Skip()
         elif (control_down or event.AltDown()) and \
                 keycode == wx.WXK_SPACE:  # Avoid Mac CMD
             self._open_cell_editor_with_content_assist()
@@ -545,14 +549,14 @@ def OnKeyDown(self, event):
         elif control_down and keycode == ord('B'):
             self._navigate_to_matching_user_keyword(
                 self.GetGridCursorRow(), self.GetGridCursorCol())
-        # else:
-        #    event.Skip()
+        else:
+           event.Skip()
 
     def OnGoToDefinition(self, event):
         self._navigate_to_matching_user_keyword(
             self.GetGridCursorRow(), self.GetGridCursorCol())
 
-    def _show_cell_information(self):
+    def show_cell_information(self):
         cell = self.cell_under_cursor
         value = self._cell_value(cell)
         if value:
@@ -876,6 +880,7 @@ def BeginEdit(self, row, col, grid):
         self._tc.SetSize((-1, self._height))
         self._tc.set_row(row)
         self._original_value = grid.GetCellValue(row, col)
+        self._tc.SetValue(self._original_value)
         self._grid = grid
         self._tc.SetInsertionPointEnd()
         self._tc.SetFocus()

src/robotide/editor/popupwindow.py

@@ -57,8 +57,9 @@ def _detach(self, event):
         event.Skip()
 
     def show_at(self, position):
-        if not self.IsShown():
+        if self.GetPosition() != position:
             self.SetPosition(position)
+        if not self.IsShown():
             self.Show()
 
     def hide(self, event=None):

src/robotide/editor/tooltips.py

@@ -27,6 +27,7 @@ def __init__(self, grid):
         self._grid = grid
         self._tooltip_timer = wx.Timer(grid.GetGridWindow())
         grid.GetGridWindow().Bind(wx.EVT_WINDOW_DESTROY, self.OnGridDestroy)
+        grid.GetGridWindow().Bind(wx.EVT_KILL_FOCUS, self.OnGridFocusLost)
         grid.GetGridWindow().Bind(wx.EVT_MOTION, self.OnMouseMotion)
         grid.GetGridWindow().Bind(wx.EVT_TIMER, self.OnShowToolTip)
         grid.Bind(wx.grid.EVT_GRID_EDITOR_HIDDEN, self.OnGridEditorHidden)
@@ -35,9 +36,18 @@ def OnGridDestroy(self, event):
         self._tooltip_timer.Stop()
         event.Skip()
 
+    def OnGridFocusLost(self, event):
+        self._tooltip_timer.Stop()
+        event.Skip()
+
     def OnMouseMotion(self, event):
         self._hide_tooltip()
-        self._start_tooltip_timer()
+        if event.CmdDown():
+            self._tooltip_timer.Stop()
+            self._grid.show_cell_information()
+        else:
+            self._information_popup.hide()
+            self._start_tooltip_timer()
         event.Skip()
 
     def _start_tooltip_timer(self):