Merge branch 'grid_sizes_fixes' into pre_release_win

Author: HelioGuilherme66

.whitesource

@@ -0,0 +1,8 @@
+##########################################################
+####    WhiteSource Integration configuration file    ####
+##########################################################
+
+# Configuration #
+#---------------#
+ws.repo.scan=true
+vulnerable.check.run.conclusion.level=failure

setup.py

@@ -24,6 +24,7 @@
 SOURCE_DIR = 'src'
 REQUIREMENTS = ['wxPython']
 
+#Windows specific requirements
 if sys.platform == 'win32':
     REQUIREMENTS.append('Pywin32')
 
@@ -62,7 +63,9 @@ class CustomInstallCommand(install):
     def run(self):
         install.run(self)
         _ = sys.stderr.write("Creating Desktop Shortcut to RIDE...\n")
-        os.system(sys.executable + " -m robotide.postinstall -install")
+        postinstaller_file = join(ROOT_DIR, 'src', 'robotide', 'postinstall', '__main__.py')
+        command = sys.executable + " " +postinstaller_file + " -install"
+        os.system(command)
 
 setup(
     name='robotframework-ride',

src/robotide/contrib/testrunner/TestRunnerAgent.py

@@ -295,8 +295,9 @@ def __init__(self, pause_on_failure=False):
 
     @staticmethod
     def is_breakpoint(name, attrs):
-        return name == 'BuiltIn.Comment' and\
-               str(attrs['args'][0]).upper().startswith(u"PAUSE")
+        if len(attrs['args']) > 0:
+            return name == 'BuiltIn.Comment' and \
+                   str(attrs['args'][0]).upper().startswith(u"PAUSE")
 
     def pause(self):
         self._resume.clear()

src/robotide/editor/cellrenderer.py

@@ -30,10 +30,42 @@ def __init__(self, default_width, max_width, auto_fit, word_wrap=True):
         self.auto_fit = auto_fit
         self.word_wrap = word_wrap
 
+    def _wordwrap(self, text, width, dc, breakLongWords=True, margin=0):
+        ''' modification of ofiginal wordwrap function without extra space'''
+        wrapped_lines = []
+        text = text.split('\n')
+        for line in text:
+            pte = dc.GetPartialTextExtents(line)
+            wid = (width - (2 * margin + 1) * dc.GetTextExtent(' ')[0])
+            idx = 0
+            start = 0
+            startIdx = 0
+            spcIdx = -1
+            while idx < len(pte):
+                # remember the last seen space
+                if line[idx] == ' ':
+                    spcIdx = idx
+
+                # have we reached the max width?
+                if pte[idx] - start > wid and (spcIdx != -1 or breakLongWords):
+                    if spcIdx != -1:
+                        idx = min(spcIdx + 1, len(pte) - 1)
+                    wrapped_lines.append(' ' * margin + line[startIdx: idx] + ' ' * margin)
+                    start = pte[idx]
+                    startIdx = idx
+                    spcIdx = -1
+
+                idx += 1
+
+            wrapped_lines.append(' ' * margin + line[startIdx: idx] + ' ' * margin)
+
+        return '\n'.join(wrapped_lines)
+
     def Draw(self, grid, attr, dc, rect, row, col, isSelected):
         text = grid.GetCellValue(row, col)
         dc.SetFont(attr.GetFont())
-        text = wordwrap.wordwrap(text, grid.GetColSize(col), dc, breakLongWords=False)
+        suggest_width = grid.GetColSize(col)
+        text = self._wordwrap(text, suggest_width, dc, breakLongWords=False)
         hAlign, vAlign = attr.GetAlignment()
         if isSelected:
             bg = grid.GetSelectionBackground()
@@ -57,39 +89,30 @@ def GetBestSize(self, grid, attr, dc, row, col):
         _font = attr.GetFont()
         dc.SetFont(_font)
 
-        col_width = grid.GetColSize(col)
-        # margin = 2  # get border width into account when submitting optimal col size
-        margin = 0
-        w, h = _font.GetPixelSize()
-        h = max(h, 8) # Probably h==0 on MSW, w==0 means width auto
-        w = max(w, 8)
-        if len(text) > 0:
-            w_sz = w * len(text)  # + 2 * w
-        else:
-            return wx.Size(w, h)  # self.default_width
+        if len(text) == 0:
+            return dc.GetTextExtent("  ")  # self.default_width
 
-        if self.auto_fit:
-            col_width = min(w_sz, col_width)
-            if col_width > self.max_width:
-                col_width = self.max_width
-        else:
-            col_width = min(w_sz, self.default_width)
+        w, h = dc.GetTextExtent(text)
 
         if self.word_wrap:
-            text = wordwrap.wordwrap(text, col_width, dc, breakLongWords=False,
-                                     margin=margin)
+        if self.auto_fit:
+                col_width = min(w, self.max_width)
+        else:
+                col_width = min(w, self.default_width)
+            suggest_width = grid.GetColSize(col)
+            text = self._wordwrap(text, suggest_width, dc, breakLongWords=False)
             w, h = dc.GetMultiLineTextExtent(text)
-            h = max(h, 8) # Probably h==0 on MSW, w==0 means width auto
-            w = max(w, 8)
+            row_height = h
         else:
-            w = col_width
+            row_height = h
         if self.auto_fit:
-            if w_sz > self.max_width:
-                w_sz = self.max_width
-            w = max(w, w_sz)
+                col_width = min(w, self.max_width)
         else:
-            return wx.Size(self.default_width, h)
-        return wx.Size(w, h)
+                col_width = grid.GetColSize(col)
+
+        # do not shrink col size (subtract col margin which is 10 pixels )
+        col_width = max(grid.GetColSize(col) - 10, col_width)
+        return wx.Size(col_width, row_height)
 
     def Clone(self):  # real signature unknown; restored from __doc__
         """ Clone(self) -> GridCellRenderer """

src/robotide/editor/contentassist.py

@@ -38,6 +38,7 @@ def __init__(self, suggestion_source):
         self.Bind(wx.EVT_KEY_DOWN, self.OnChar)
         self.Bind(wx.EVT_KILL_FOCUS, self.OnFocusLost)
         self.Bind(wx.EVT_MOVE, self.OnFocusLost)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         self._showing_content_assist = False
         self._row = None
         self.gherkin_prefix = ''  # Store gherkin prefix from input to add \
@@ -91,8 +92,8 @@ def _variable_creator_value(self, value, symbol, from_, to_):
         return value[:from_]+symbol+'{'+value[from_:to_]+'}'+value[to_:]
 
     def OnFocusLost(self, event, set_value=True):
+        event.Skip()
         if not self._popup.is_shown():
-            event.Skip()
             return
         if self.gherkin_prefix:
             value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
@@ -104,7 +105,12 @@ def OnFocusLost(self, event, set_value=True):
         else:
             self.Clear()
         self.hide()
-        event.Skip()
+
+    def OnDestroy(self, event):
+        # all pushed eventHandlers need to be popped before close
+        # the last event handler is window object itself - do not pop itself
+        while self.GetEventHandler() is not self:
+            self.PopEventHandler()
 
     def reset(self):
         self._popup.reset()

src/robotide/editor/gridbase.py

@@ -42,7 +42,6 @@ def _bind_to_events(self):
         self.Bind(grid.EVT_GRID_SELECT_CELL, self.OnSelectCell)
         self.Bind(grid.EVT_GRID_RANGE_SELECT, self.OnRangeSelect)
         self.Bind(grid.EVT_GRID_CELL_RIGHT_CLICK, self.OnCellRightClick)
-        self.Bind(grid.EVT_GRID_CMD_COL_SIZE, self.OnCellColSizeChanged)
 
     def register_context_menu_hook(self, callable):
         self._popup_creator.add_hook(callable)
@@ -159,8 +158,8 @@ def _write_data(self, data, update_history=True):
         for row_index, row_data in enumerate(data):
             for col_index, cell_value in enumerate(row_data):
                 self.write_cell(row_index, col_index, cell_value, update_history)
-        self.AutoSizeColumns()
-        self.AutoSizeRows()
+        # self.AutoSizeColumns()
+        # self.AutoSizeRows()
         self.EndBatch()
 
     def OnSelectCell(self, event):
@@ -195,11 +194,6 @@ def OnCellRightClick(self, event):
         self._popup_creator.show(self, PopupMenuItems(self, self._popup_items),
                                  self.get_selected_content())
 
-    def OnCellColSizeChanged(self, event):
-        self.ForceRefresh()
-        self.AutoSizeRows()
-        event.Skip()
-
     # TODO This code is overriden at fieldeditors
     def OnInsertCells(self, event):
         self._insert_or_delete_cells(self._insert_cells, event)

src/robotide/editor/gridcolorizer.py

@@ -34,25 +34,16 @@ def close(self):
 
     def colorize(self, selection_content):
         self._current_task_id += 1
-        if self._timer is None:
-            self._timer = wx.CallLater(1, self._coloring_task, self._current_task_id, selection_content)
-        else:
-            self._timer.Restart(50, self._current_task_id, selection_content)
+        self._coloring_task(selection_content)
 
-    def _coloring_task(self, task_index, selection_content, row=0, col=0):
-        # Since this is a callback in CallLater, the grid might have
-        # been destroyed e.g. when changing tree nodes. In this case
-        # self._grid points to a PyDeadObject, which is Falsy.
-        if task_index != self._current_task_id or not(self._grid):
-            return
+    def _coloring_task(self, selection_content, row=0, col=0):
         if row >= self._grid.NumberRows:
             self._grid.ForceRefresh()
-            self._grid.AutoSizeRows()
         elif col < self._grid.NumberCols:
             self._colorize_cell(row, col, selection_content)
-            wx.CallAfter(self._coloring_task, task_index, selection_content, row, col+1)
+            self._coloring_task(selection_content, row, col+1)
         else:
-            self._coloring_task(task_index, selection_content, row+1, 0)
+            self._coloring_task(selection_content, row+1, 0)
 
     def _colorize_cell(self, row, col, selection_content):
         cell_info = self._controller.get_cell_info(row, col)

src/robotide/editor/kweditor.py

@@ -113,6 +113,7 @@ def __init__(self, parent, controller, tree):
         self._marked_cell = None
         self._make_bindings()
         self._write_steps(self._controller)
+        self.autosize()
         self._tree = tree
         self._has_been_clicked = False
         self._counter = 0  # Workaround for double delete actions
@@ -145,7 +146,16 @@ def _set_cells(self):
             CellRenderer(col_size, max_col_size, auto_col_size, word_wrap))
         self.SetRowLabelSize(wx.grid.GRID_AUTOSIZE)
         self.SetColLabelSize(0)
-        self.SetDefaultColSize(col_size, resizeExistingCols=True)
+        if not auto_col_size and not word_wrap:
+            self.SetDefaultColSize(col_size, resizeExistingCols=True)
+        else:
+            self.SetDefaultColSize(wx.grid.GRID_AUTOSIZE, resizeExistingCols=True)
+
+        if auto_col_size:
+            self.Bind(grid.EVT_GRID_CMD_COL_SIZE, self.OnCellColSizeChanged)
+        else:
+            self.Unbind(grid.EVT_GRID_CMD_COL_SIZE)
+
         if word_wrap:
             self.SetDefaultRowSize(wx.grid.GRID_AUTOSIZE)
         self.SetDefaultCellOverflow(False)  # DEBUG
@@ -195,15 +205,15 @@ def OnSettingsChanged(self, data):
         '''Redraw the colors if the color settings are modified'''
         section, setting = data.keys
         if section == 'Grid':
-            if 'text' in setting or 'background' in setting:
-                self._colorize_grid()
-            elif 'font' in setting:
+            if 'font' in setting:
                 self._set_fonts(update_cells=True)
             elif ('col size' in setting
                   or 'max col size' in setting
-                  or 'auto size cols' in setting):
+                  or 'auto size cols' in setting
+                  or 'word wrap' in setting):
                 self._set_cells()
-                self.ForceRefresh()
+            self._colorize_grid()
+            self.autosize()
 
     def OnSelectCell(self, event):
         self._cell_selected = True
@@ -375,7 +385,11 @@ def _colorize_grid(self):
             self._parent.highlight(selection_content, expand=False)
 
     def highlight(self, text, expand=True):
-        self._colorizer.colorize(text)
+        wx.CallAfter(self._colorizer.colorize, text)
+
+    def autosize(self):
+        wx.CallAfter(self.AutoSizeColumns, False)
+        wx.CallAfter(self.AutoSizeRows, False)
 
     def _get_single_selection_content_or_none_on_first_call(self):
         if self._cell_selected:
@@ -395,6 +409,8 @@ def _format_comments(self, data):
 
     def cell_value_edited(self, row, col, value):
         self._execute(ChangeCellValue(row, col, value))
+        wx.CallAfter(self.AutoSizeColumn, col, False)
+        wx.CallAfter(self.AutoSizeRow, row, False)
 
     def get_selected_datafile_controller(self):
         return self._controller.datafile_controller
@@ -529,8 +545,7 @@ def OnKeyDown(self, event):
         # 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
+                (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")
@@ -548,14 +563,14 @@ def OnKeyDown(self, event):
             event.Skip()
         elif event.AltDown() and keycode == wx.WXK_RETURN:
             self._move_cursor_down(event)
-            # event.Skip()  #DEBUG was moving down 2 rows
+            # event.Skip()
         elif keycode == wx.WXK_WINDOWS_MENU:
             self.OnCellRightClick(event)
         elif keycode in [wx.WXK_RETURN, wx.WXK_BACK]:
             if _iscelleditcontrolshown:
                 self.save()
-                # event.Skip()  #DEBUG was moving left and down with RETURN
             self._move_grid_cursor(event, keycode)
+            # event.Skip()
         elif (control_down or event.AltDown()) and \
                 keycode == wx.WXK_SPACE:  # Avoid Mac CMD
             self._open_cell_editor_with_content_assist()
@@ -681,6 +696,10 @@ def OnCellRightClick(self, event):
     def OnSelectAll(self, event):
         self.SelectAll()
 
+    def OnCellColSizeChanged(self, event):
+        wx.CallAfter(self.AutoSizeRows, False)
+        event.Skip()
+
     def OnCellLeftClick(self, event):
         self._tooltips.hide()
         # if event.GetModifiers() == wx.MOD_CONTROL:

src/robotide/editor/settingeditors.py

@@ -142,10 +142,12 @@ def _mainframe_has_focus(self):
 
     def OnWindowDestroy(self, event):
         self._stop_popup_timer()
+        self._tooltip.hide()
         event.Skip()
 
     def OnLeaveWindow(self, event):
         self._stop_popup_timer()
+        self._tooltip.hide()
         event.Skip()
 
     def OnPopupTimer(self, event):

src/robotide/postinstall/__main__.py

@@ -45,7 +45,7 @@ def verify_install():
                          "or pip install wxPython")
         return False
     else:
-        sys.stderr.write("wxPython is installed.\n%s" % version())
+        sys.stderr.write("wxPython is installed.\n%s\n" % version())
         return True