From 7780c70f512c4df82c61072cb2fcc1ce6f5a37be Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Fri, 2 Aug 2024 01:36:37 +0100
Subject: [PATCH 1/3] Improve Text Editor.

---
 README.adoc                                       | 2 +-
 src/robotide/application/releasenotes.py          | 2 +-
 src/robotide/editor/texteditor.py                 | 1 +
 src/robotide/lib/robot/parsing/tablepopulators.py | 8 ++++----
 src/robotide/lib/robot/variables/tablesetter.py   | 8 ++++++--
 src/robotide/version.py                           | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.adoc b/README.adoc
index 539713cfe..5db41f636 100644
--- a/README.adoc
+++ b/README.adoc
@@ -40,7 +40,7 @@ Likewise, the current version of wxPython, is 4.2.1, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 &lt;= python &lt;= 3.12) Install current development version (**2.1dev61**) with:
+(3.8 &lt;= python &lt;= 3.12) Install current development version (**2.1dev62**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/master.zip`
 
diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index 734898510..ebbf6f6ad 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -314,7 +314,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 29/July/2024.</p>
+<p>RIDE {VERSION} was released on 02/August/2024.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>
diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index 2675006a5..59c9d03e6 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -312,6 +312,7 @@ def on_tab_change(self, message):
                 self._set_read_only(self._editor.source_editor.readonly)
             except Exception as e:  # DEBUG: When using only Text Editor exists error in message topic
                 print(e)
+            wx.CallAfter(self._editor.source_editor.on_style, None)  # DEBUG Sometimes when we enter Text Edit, styles are not applied
             self._editor.Refresh()
         elif message.oldtab == self.title:
             self._editor.remove_and_store_state()
diff --git a/src/robotide/lib/robot/parsing/tablepopulators.py b/src/robotide/lib/robot/parsing/tablepopulators.py
index 1c4509046..cfeca63a4 100644
--- a/src/robotide/lib/robot/parsing/tablepopulators.py
+++ b/src/robotide/lib/robot/parsing/tablepopulators.py
@@ -307,8 +307,8 @@ def add(self, row):
         self._comments.add(row)
 
     def _add(self, row):
-        if row.cells == ['...']:
-            self._deprecate_continuation_without_values()
+        # if row.cells == ['...']:  # DEBUG: Removed non-useful warning
+        #     self._deprecate_continuation_without_values()
         self._value.extend(row.tail if self.row_continue or not self._data_added else row.data)
         # print(f"DEBUG: tablepopulators.py _PropertyPopulator {self._data_added=} _add row.cells={row.cells}"
         #       f" ADDED value={self._value}")
@@ -430,8 +430,8 @@ def _add(self, row):
 class StepPopulator(_PropertyPopulator):
 
     def _add(self, row):
-        if row.cells == ['...']:
-            self._deprecate_continuation_without_values()
+        # if row.cells == ['...']:  # DEBUG: Removed non-useful warning
+        #     self._deprecate_continuation_without_values()
         if row.cells[0] == '...':
             self._value.extend(row.cells)
         else:
diff --git a/src/robotide/lib/robot/variables/tablesetter.py b/src/robotide/lib/robot/variables/tablesetter.py
index 91f4d57ad..e199f4f73 100644
--- a/src/robotide/lib/robot/variables/tablesetter.py
+++ b/src/robotide/lib/robot/variables/tablesetter.py
@@ -65,6 +65,10 @@ def __init__(self, values, error_reporter=None):
         self._resolving = False
 
     def _format_values(self, values):
+        # print(f"DEBUG: tablesetter.py VariableTableValueBase ENTER values={values}")
+        if '...' in values:
+            values = [elem for elem in values if elem != '...']
+            # print(f"DEBUG: tablesetter.py VariableTableValueBase REMOVED ... values={values}")
         return values
 
     def resolve(self, variables):
@@ -103,8 +107,8 @@ def _format_values(self, values):
             elif values[-1].startswith('separator='):  # New in RF 7.0
                 separator = values[-1][10:]
                 values = values[:-2]
-        # if '...' in values:
-        #     values = [elem for elem in values if elem != '...']
+            if not separator and '...' in values:
+                values = [elem for elem in values if elem != '...']
         return separator, values
 
     def _replace_variables(self, values, variables):
diff --git a/src/robotide/version.py b/src/robotide/version.py
index 8ae32569c..7ace93a25 100644
--- a/src/robotide/version.py
+++ b/src/robotide/version.py
@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.1dev61'
+VERSION = 'v2.1dev62'

From dd64fe4dc8535075b41604e7f036880bb01789c0 Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Sat, 3 Aug 2024 19:07:57 +0100
Subject: [PATCH 2/3] Debug unit test for clipboarrd

---
 utest/editor/test_grid.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/utest/editor/test_grid.py b/utest/editor/test_grid.py
index e361c51de..ac4e68eba 100644
--- a/utest/editor/test_grid.py
+++ b/utest/editor/test_grid.py
@@ -92,6 +92,13 @@ def setUp(self):
             self._editor = EditorWithData()
 
         def test_copy_one_cell(self):
+            print("")
+            for row in range(3):
+                text = f"{row}: "
+                for col in range(3):
+                    cell = self._editor.GetCellValue(row, col)
+                    text += f" {cell} |"
+                print(f"{text}")
             self._copy_block_and_verify((0, 0, 0, 0), [['kw1']])
 
         def test_copy_row(self):
@@ -103,8 +110,8 @@ def test_copy_block(self):
         def _copy_block_and_verify(self, block, exp_content):
             self._editor.SelectBlock(*block)
             self._editor.copy()
-            assert (self._editor._clipboard_handler._clipboard.get_contents() ==
-                          exp_content)
+            print(f"\nClipboard Content: {self._editor._clipboard_handler._clipboard.get_contents()}")
+            assert (self._editor._clipboard_handler._clipboard.get_contents() == exp_content)
             self._verify_grid_content(DATA)
 
         def test_cut_one_cell(self):

From deecdb369cf26be11f6e7af8df764efea79c8dd2 Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Sat, 3 Aug 2024 20:43:18 +0100
Subject: [PATCH 3/3] Fix double Ctrl-Z on Linux

---
 src/robotide/application/releasenotes.py | 2 +-
 src/robotide/editor/kweditor.py          | 3 +++
 src/robotide/editor/macroeditors.py      | 4 +++-
 utest/editor/test_macroeditors.py        | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index ebbf6f6ad..bfaceedc0 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -314,7 +314,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 02/August/2024.</p>
+<p>RIDE {VERSION} was released on 03/August/2024.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>
diff --git a/src/robotide/editor/kweditor.py b/src/robotide/editor/kweditor.py
index 991654467..80ba4b994 100755
--- a/src/robotide/editor/kweditor.py
+++ b/src/robotide/editor/kweditor.py
@@ -205,6 +205,7 @@ def _resize_grid(self):
             self.AutoSizeColumns(False)
         if self.settings.get("word wrap", True):
             self.AutoSizeRows(False)
+        self.SetFocus()
 
     def _set_cells(self):
         col_size = self.settings.get("col size", 150)
@@ -794,6 +795,7 @@ def _call_ctrl_function(self, event: object, keycode: int):
         elif keycode == ord('V'):
             self.on_paste(event)
         elif keycode == ord('Z'):
+            # print("DEBUG: kweditor.py _call_ctrl_function Pressed CTRL-Z")
             self.on_undo(event)
         elif keycode == ord('A'):
             self.on_select_all(event)
@@ -859,6 +861,7 @@ def on_key_down(self, event):
             skip = self._call_alt_function(event, keycode)
         else:
             skip = self._call_direct_function(event, keycode)
+        self.SetFocus()
         if skip:
             event.Skip()
 
diff --git a/src/robotide/editor/macroeditors.py b/src/robotide/editor/macroeditors.py
index 1dc974725..dbb2e11fc 100644
--- a/src/robotide/editor/macroeditors.py
+++ b/src/robotide/editor/macroeditors.py
@@ -52,7 +52,9 @@ def save(self):
         self.kweditor.save()
 
     def undo(self):
-        self.kweditor.on_undo()
+        # DEBUG: On Linux we were having double Ctrl-Z action
+        # self.kweditor.on_undo()
+        pass
 
     def redo(self):
         self.kweditor.on_redo()
diff --git a/utest/editor/test_macroeditors.py b/utest/editor/test_macroeditors.py
index e79708bef..cc9d4cefe 100644
--- a/utest/editor/test_macroeditors.py
+++ b/utest/editor/test_macroeditors.py
@@ -68,7 +68,7 @@ def setUp(self):
     def test_delegation_to_kw_editor(self):
         for method, kw_method in \
             [('save', 'save'),
-             ('undo', 'on_undo'),
+             # ('undo', 'on_undo'),  # Disabled because of double Ctrl-Z
              ('redo', 'on_redo'),
              ('cut', 'on_cut'),
              ('copy', 'on_copy'),
@@ -84,7 +84,8 @@ def test_delegation_to_kw_editor(self):
             self.tc_editor.kweditor = kw_mock
             getattr(kw_mock, kw_method).is_to_be_called()
             getattr(self.tc_editor, method)()
-            assert getattr(kw_mock, kw_method).has_been_called(), f"Should have called \"{kw_method}\" when calling \"{method}\""
+            assert getattr(kw_mock, kw_method).has_been_called(), (f"Should have called \""
+                                                                   f"{kw_method}\" when calling \"{method}\"")
 
 
 if __name__ == '__main__':