From f8cbe1237f64c8cd07c9b664f137e115bc95ac8c Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Thu, 15 Aug 2024 20:48:29 +0100
Subject: [PATCH 1/2] Fix deleting selected text when typing in Text Editor

---
 README.adoc                              |  2 +-
 src/robotide/application/releasenotes.py |  2 +-
 src/robotide/editor/texteditor.py        | 14 +++++++-------
 src/robotide/version.py                  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.adoc b/README.adoc
index e5e02e56f..c81e31add 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.1dev68**) with:
+(3.8 &lt;= python &lt;= 3.12) Install current development version (**2.1dev69**) 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 4d759fd98..3fec22393 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -325,7 +325,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 15/August/2024.</p>
+<p>RIDE {VERSION} was released on 16/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 b1be32af2..cbf02118d 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -1242,7 +1242,13 @@ def on_editor_key(self, event):
         keycode = event.GetKeyCode()
         keyvalue = event.GetUnicodeKey()
         # print(f"DEBUG: TextEditor key up focused={self.is_focused()} modify {self.source_editor.GetModify()}")
-        if keycode == wx.WXK_DELETE:  # DEBUG on Windows we only get here, single Text Editor
+        if keycode in [wx.WXK_RETURN, wx.WXK_NUMPAD_ENTER]:
+            self.mark_file_dirty(self.source_editor.GetModify())
+            return
+        if keyvalue == wx.WXK_NONE and keycode in [wx.WXK_CONTROL, wx.WXK_RAW_CONTROL]:
+            self.source_editor.hide_kw_doc()
+        elif keycode == wx.WXK_DELETE or (keyvalue != wx.WXK_NONE and keycode > keyvalue):
+            # DEBUG on Windows we only get here, single Text Editor
             selected = self.source_editor.GetSelection()
             if selected[0] == selected[1]:
                 pos = self.source_editor.GetInsertionPoint()
@@ -1250,12 +1256,6 @@ def on_editor_key(self, event):
                     self.source_editor.DeleteRange(selected[0], 1)
             else:
                 self.source_editor.DeleteRange(selected[0], selected[1] - selected[0])
-            self.mark_file_dirty(self.source_editor.GetModify())
-        if keycode in [wx.WXK_RETURN, wx.WXK_NUMPAD_ENTER]:
-            self.mark_file_dirty(self.source_editor.GetModify())
-            return
-        if keyvalue == wx.WXK_NONE and keycode in [wx.WXK_CONTROL, wx.WXK_RAW_CONTROL]:
-            self.source_editor.hide_kw_doc()
         if self.is_focused():  # DEBUG and keycode != wx.WXK_CONTROL and keyvalue >= ord(' ') and self.dirty:
             self.mark_file_dirty(self.source_editor.GetModify())
         event.Skip()
diff --git a/src/robotide/version.py b/src/robotide/version.py
index a410acfd8..e2b6031be 100644
--- a/src/robotide/version.py
+++ b/src/robotide/version.py
@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.1dev68'
+VERSION = 'v2.1dev69'

From 050b7ea52d92011eaad03a979d56d0e74c4c3849 Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Thu, 15 Aug 2024 22:34:37 +0100
Subject: [PATCH 2/2] Fix saving when starting test run with changes in Text
 Editor

---
 src/robotide/editor/texteditor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index cbf02118d..f065aea47 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -226,6 +226,7 @@ def on_data_changed(self, message):
                 # Workaround for remarked dirty with Ctrl-S
                 if self.is_focused() and self._save_flag == 0 and isinstance(message, RideSaving):
                     self._save_flag = 1
+                    RideBeforeSaving().publish()
                 if self.is_focused() and self._save_flag == 1 and isinstance(message, RideDataDirtyCleared):
                     self._save_flag = 2
                 if self.is_focused() and self._save_flag == 2 and isinstance(message, RideSaved):
@@ -235,7 +236,7 @@ def on_data_changed(self, message):
                 # if self.is_focused() and self._save_flag == 3 and isinstance(message, RideDataChangedToDirty):
                 #     self._save_flag = 4
                 #     wx.CallAfter(self._editor.mark_file_dirty, False)
-                if self.is_focused() and isinstance(message, RideBeforeSaving):
+                if isinstance(message, RideBeforeSaving):
                     self._editor.is_saving = False
                     # Reset counter for Workaround for remarked dirty with Ctrl-S
                     self._save_flag = 0