Commented cells (#2618)

* Fix not possible to delete # commented cells in Grid Editor

* Sharp comment and uncomment rows. WIP, needs decision when single cell, needs undo state save

* Final code. Initial unit tests

* Fix syncronizing expand/collapse of settings panel on Linux. Closes #2598

Author: HelioGuilherme66

CHANGELOG.adoc

@@ -16,6 +16,8 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 == Fixed
 
+- Fixed non syncronized expanding/collapse of Settings panel in Grid Editor, on Linux
+- Fixed not working the deletion of cells commented with ``\# `` in Grid Editor with ``Ctrl-Shift-D``
 - Fixed empty line being always added to the Variables section in Text Editor
 - Fixed wrong project reloading when file system changes detected, and other related problems
 - Fixed control commands (``FOR``, ``IF``, ``TRY``, etc) being colorized as valid keywords when typed not in all caps in Grid Editor

src/robotide/application/CHANGELOG.html

@@ -6,6 +6,10 @@
 Added sincronization with Project Explorer to navigate to selected item, Test Case, Keyword, Variable, in Text Editor
   Note: This feature is working fine in Fedora 38, but not on Windows and macOS.
 </li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_fixed"></a>2. Fixed</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+Fixed non syncronized expanding/collapse of Settings panel in Grid Editor, on Linux
+</li><li class="listitem">
+Fixed not working the deletion of cells commented with ``\# `` in Grid Editor with ``Ctrl-Shift-D``
+</li><li class="listitem">
 Fixed empty line being always added to the Variables section in Text Editor
 </li><li class="listitem">
 Fixed wrong project reloading when file system changes detected, and other related problems

src/robotide/application/releasenotes.py

@@ -147,7 +147,7 @@ def set_content(self, html_win, content):
 <p><a class="reference external" href="https://github.com/robotframework/RIDE/">RIDE (Robot Framework IDE)</a>
  {VERSION} is a new release with minor enhancements and bug fixes. The reference for valid arguments is
  <a class="reference external" href="https://robotframework.org/">Robot Framework</a> installed version, which is at this
-  moment 6.0.2. However, internal library is based on version 3.1.2, to keep compatibility with old formats.</p>
+  moment 6.1.1. However, internal library is based on version 3.1.2, to keep compatibility with old formats.</p>
 <p></p>
 <ul class="simple">
 <li>This version supports Python 3.6 up to 3.11.</li>
@@ -168,6 +168,8 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Fixed non syncronized expanding/collapse of Settings panel in Grid Editor, on Linux</li>
+<li>Fixed not working the deletion of cells commented with ``# `` in Grid Editor with ``Ctrl-Shift-D``</li> 
 <li>Fixed empty line being always added to the Variables section in Text Editor</li>
 <li>Improved project file system changes and reloading</li>
 <li>Added context menu to RIDE tray icon. Options Show, Hide and Close</li>
@@ -227,6 +229,6 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 30/Jul/2023.</p>
+<p>RIDE {VERSION} was released on 06/Aug/2023.</p>
 </div>
 """

src/robotide/controller/ctrlcommands.py

@@ -1216,6 +1216,26 @@ def _get_undo_command(self):
         return CommentRow(self._row)
 
 
+class SharpCommentRow(_RowChangingCommand):
+
+    def _change_value(self, context):
+        self._step(context).sharp_comment()
+        return True
+
+    def _get_undo_command(self):
+        return SharpUncommentRow(self._row)
+
+
+class SharpUncommentRow(_RowChangingCommand):
+
+    def _change_value(self, context):
+        self._step(context).sharp_uncomment()
+        return True
+
+    def _get_undo_command(self):
+        return SharpCommentRow(self._row)
+
+
 INDENTED_INNER = ['ELSE', 'ELSE IF', 'EXCEPT', 'FINALLY']
 INDENTED_START = ['FOR', 'IF', 'WHILE', 'TRY'] + INDENTED_INNER
 
@@ -1502,6 +1522,14 @@ def uncomment_rows(rows):
     return StepsChangingCompositeCommand(*[UncommentRow(r) for r in rows])
 
 
+def sharp_comment_rows(rows):
+    return StepsChangingCompositeCommand(*[SharpCommentRow(r) for r in rows])
+
+
+def sharp_uncomment_rows(rows):
+    return StepsChangingCompositeCommand(*[SharpUncommentRow(r) for r in rows])
+
+
 def clear_area(top_left, bottom_right):
     row_s, col_s = top_left
     row_e, col_e = bottom_right

src/robotide/controller/stepcontrollers.py

@@ -325,6 +325,27 @@ def comment(self):
         col = self._first_non_empty_cell()  # .step_controller_step.inner_kw_pos
         self.insert_value_before(col, 'Comment')
 
+    def sharp_comment(self):
+        col = self._first_non_empty_cell()
+        self.insert_sharp_comment(col)
+
+    def insert_sharp_comment(self, col):
+        cell_value = self.get_value(col)
+        new_value = "# " + cell_value
+        self.change(col, new_value)
+
+    def sharp_uncomment(self):
+        col = self._first_non_empty_cell()
+        self.remove_sharp_comment(col)
+
+    def remove_sharp_comment(self, col):
+        cell_value = self.get_value(col)
+        if cell_value.startswith('#'):
+            new_value = cell_value.lstrip('#').lstrip(' ')
+        else:
+            return
+        self.change(col, new_value)
+
     def _is_commented(self, col):
         if self._has_comment_keyword():
             return col > self._keyword_column
@@ -380,12 +401,9 @@ def shift_left(self, from_column, delete=False):
             from_column -= 1
         if not delete and from_column == 0 and cells[from_column] != '':
             return
-        comment = self._get_comment(cells)
         if len(cells) > from_column:
-            if comment:
-                cells.pop()
             cells = cells[:from_column] + cells[from_column + 1:]
-            self.recreate(cells, comment)
+            self.recreate(cells)
 
     @staticmethod
     def first_non_empty_cell(cells):

src/robotide/editor/__init__.py

@@ -242,6 +242,14 @@ def on_uncomment_rows(self, event):
         _ = event
         self.editor.uncomment_rows()
 
+    def on_sharp_comment_rows(self, event):
+        _ = event
+        self.editor.sharp_comment_rows()
+
+    def on_sharp_uncomment_rows(self, event):
+        _ = event
+        self.editor.sharp_uncomment_rows()
+
     def on_comment_cells(self, event):
         _ = event
         self.editor.comment_cells()

src/robotide/editor/editors.py

@@ -182,6 +182,8 @@ def _collabsible_changed(self, event=None):
         self._store_settings_open_status()
         self.GetSizer().Layout()
         self.Refresh()
+        self.Parent.GetSizer().Layout()
+        self.Parent.Refresh()
         if event:
             event.Skip()
 

src/robotide/editor/kweditor.py

@@ -33,7 +33,7 @@
     paste_area, delete_rows, add_rows, comment_rows, insert_cells, delete_cells, \
     uncomment_rows, Undo, Redo, RenameKeywordOccurrences, ExtractKeyword, \
     add_keyword_from_cells, MoveRowsUp, MoveRowsDown, extract_scalar, extract_list, \
-    insert_area
+    insert_area, sharp_comment_rows, sharp_uncomment_rows
 from ..editor.cellrenderer import CellRenderer
 from ..pluginapi import Plugin
 from ..publish import RideItemStepsChanged, RideSaved, PUBLISHER, RideBeforeSaving
@@ -377,6 +377,16 @@ def on_uncomment_rows(self, event=None):
         self._resize_grid()
         self._skip_except_on_mac(event)
 
+    def on_sharp_comment_rows(self, event=None):
+        self._execute(sharp_comment_rows(self.selection.rows()))
+        self._resize_grid()
+        self._skip_except_on_mac(event)
+
+    def on_sharp_uncomment_rows(self, event=None):
+        self._execute(sharp_uncomment_rows(self.selection.rows()))
+        self._resize_grid()
+        self._skip_except_on_mac(event)
+
     def on_move_rows_up(self, event=None):
         _ = event
         self._row_move(MoveRowsUp, -1)
@@ -815,13 +825,23 @@ def _open_cell_editor_and_execute_sharp_uncomment(self):
         # Meant for a single cell selection!
         wx.CallAfter(self.open_cell_editor().execute_sharp_uncomment)
 
+    def current_cell(self):
+        curcell = [self.GetGridCursorRow(), self.GetGridCursorCol()]
+        return curcell
+
     def on_comment_cells(self, event):
         _ = event
-        self._open_cell_editor_and_execute_sharp_comment()
+        if self.GetSelectionBlockTopLeft():
+            self.on_sharp_comment_rows(event)
+        else:
+            self._open_cell_editor_and_execute_sharp_comment()
 
     def on_uncomment_cells(self, event):
         _ = event
-        self._open_cell_editor_and_execute_sharp_uncomment()
+        if self.GetSelectionBlockTopLeft():
+            self.on_sharp_uncomment_rows(event)
+        else:
+            self._open_cell_editor_and_execute_sharp_uncomment()
 
     def on_cell_right_click(self, event):
         self._tooltips.hide()

src/robotide/editor/macroeditors.py

@@ -91,6 +91,12 @@ def comment_rows(self):
     def uncomment_rows(self):
         self.kweditor.on_uncomment_rows()
 
+    def sharp_comment_rows(self):
+        self.kweditor.on_sharp_comment_rows()
+
+    def sharp_uncomment_rows(self):
+        self.kweditor.on_sharp_uncomment_rows()
+
     def comment_cells(self):
         self.kweditor.on_comment_cells(None)
 

src/robotide/version.py

@@ -14,4 +14,4 @@
 #  limitations under the License.
 #
 # Automatically generated by `tasks.py`.
-VERSION = 'v2.0.7dev8'
+VERSION = 'v2.0.7dev9'