From 8d7bae0d1541cbef52247d06a187f85d63bc66d1 Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Sun, 29 Mar 2026 13:28:16 +0100
Subject: [PATCH 1/3] Add options to make visible spaces and newlines in Text
 Editor.

---
 CHANGELOG.adoc                            |  3 +++
 src/robotide/application/releasenotes.py  |  7 ++++---
 src/robotide/editor/customsourceeditor.py | 11 ++++++-----
 src/robotide/editor/pythoneditor.py       |  5 ++++-
 src/robotide/editor/texteditor.py         | 11 +++++++----
 src/robotide/preferences/configobj        |  2 +-
 src/robotide/preferences/settings.cfg     |  2 ++
 src/robotide/version.py                   |  2 +-
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index de277de69..d77736c63 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -8,6 +8,9 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 == https://github.com/robotframework/RIDE[Unreleased]
 
+=== Fixed
+- Fixed exception seen in console when selecting Tools->Library Finder... on a clean install.
+
 === Changed
 - Changed isbinary to be internal library, instead of being dependency.
 
diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index f3c96db1e..94b623dbf 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -150,7 +150,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 some enhancements and bug fixes. The reference for valid arguments is
- <a class="reference external" href="https://robotframework.org/">Robot Framework</a> current version, 7.4.1. However, 
+ <a class="reference external" href="https://robotframework.org/">Robot Framework</a> current version, 7.4.2. However, 
  internal library code is originally based on version 3.1.2, but adapted for new versions.</p>
 <ul class="simple">
 <li>This version supports Python 3.9 up to 3.14.</li>
@@ -179,6 +179,7 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Fixed exception seen in console when selecting Tools->Library Finder... on a clean install.</li>
 <li>The Test Suites Explorer can be visible or hidden with F12 (View->View Test Suites Explorer). Pane can be made
  floating or docked, by dragging or by double-clicking its top bar.</li>
 <li>In File Explorer opening non-text files is done by the operating system registered app.</li>
@@ -192,7 +193,7 @@ def set_content(self, html_win, content):
 </ul>
 <!-- <p>We hope to implement or complete features and make fixes on next major version 2.1 (in mid Autumm of 2024).</p>
 -->
-<p><strong>The minimal wxPython version is, 4.0.7, and RIDE supports the current version, 4.2.4, which we recommend.
+<p><strong>The minimal wxPython version is, 4.0.7, and RIDE supports the current version, 4.2.5, which we recommend.
 </strong></p>
 <p><em>Linux users are advised to install first wxPython from .whl package at</em> <a class="reference external"
  href="https://extras.wxpython.org/wxPython4/extras/linux/gtk3/">wxPython.org</a>, or by using the system package
@@ -243,7 +244,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">python -m robotide.postinstall -install</pre>
 <p>or</p>
 <pre class="literal-block">ride_postinstall.py -install</pre>
-<p>RIDE {VERSION} was released on 11/January/2026.</p>
+<p>RIDE {VERSION} was released on 28/March/2026.</p>
 <br/>
 <!-- 
 <h3>Celebrate the bank holiday, 1st December, Restoration of the Independence of Portugal (from Spain in 1640)!!</h3>
diff --git a/src/robotide/editor/customsourceeditor.py b/src/robotide/editor/customsourceeditor.py
index 17a2f79fc..d1a5f1f41 100644
--- a/src/robotide/editor/customsourceeditor.py
+++ b/src/robotide/editor/customsourceeditor.py
@@ -40,7 +40,7 @@
 class SourceCodeEditor(PythonSTC):
     def __init__(self, parent, options, style=wx.BORDER_NONE):
         PythonSTC.__init__(self, parent, -1, options, style=style)
-        self.SetUpEditor()
+        self.SetUpEditor(options)
 
     # Some methods to make it compatible with how the wxTextCtrl is used
     def SetValue(self, value):
@@ -90,7 +90,7 @@ def SelectLine(self, line):
         end = self.GetLineEndPosition(line)
         self.SetSelection(start, end)
 
-    def SetUpEditor(self):
+    def SetUpEditor(self, eoptions: dict):
         """
         This method carries out the work of setting up the Code editor.
         It's seperate so as not to clutter up the init code.
@@ -122,13 +122,13 @@ def SetUpEditor(self):
         self.SetTabWidth(4)               # Proscribed tab size for wx
         self.SetUseTabs(False)            # Use spaces rather than tabs, or TabTimmy will complain!
         # White space
-        self.SetViewWhiteSpace(False)   # Don't view white space
+        self.SetViewWhiteSpace(eoptions['visible spaces'])   # Don't view white space
 
         # EOL: Since we are loading/saving ourselves, and the
         # strings will always have \n's in them, set the STC to
         # edit them that way.
         self.SetEOLMode(wx.stc.STC_EOL_LF)
-        self.SetViewEOL(False)
+        self.SetViewEOL(eoptions['visible EOL'])
 
         # No right-edge mode indicator
         self.SetEdgeMode(stc.STC_EDGE_NONE)
@@ -232,7 +232,8 @@ def __init__(self, parent, main_frame, filepath=None):
         self.parent = parent
         wx.Panel.__init__(self, parent, size=wx.Size(1, 1))
         self.mainFrame = main_frame
-        self.editor = SourceCodeEditor(self, options={'tab markers':True, 'fold symbols':2})
+        self.editor = SourceCodeEditor(self, options={'tab markers':True, 'fold symbols':2,
+                                                      'visible spaces':True, 'visible EOL':False})
         self.editor.RegisterModifiedEvent(self.on_code_modified)
         parent.SetName(f'Code Editor: {filepath}')
         """
diff --git a/src/robotide/editor/pythoneditor.py b/src/robotide/editor/pythoneditor.py
index e839d1ef2..c8d621cb2 100644
--- a/src/robotide/editor/pythoneditor.py
+++ b/src/robotide/editor/pythoneditor.py
@@ -59,7 +59,10 @@ def __init__(self, parent, idd, options: dict, pos=wx.DefaultPosition, size=wx.D
         self.SetProperty("tab.timmy.whinge.level", "1")
         self.SetMargins(2, 2)
 
-        self.SetViewWhiteSpace(False)
+        self.visible_spaces = options['visible spaces']
+        self.visible_EOL = options['visible EOL']
+        self.SetViewWhiteSpace(self.visible_spaces)
+        self.SetViewEOL(self.visible_EOL)
         self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)
         self.SetEdgeColumn(78)
 
diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index 6a0a240bd..1f30bdf55 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -2641,8 +2641,11 @@ def __init__(self, parent, readonly=False, language=None, style=wx.BORDER_NONE):
         self._settings = parent.source_editor_parent.app.settings
         self.tab_markers = self._settings[PLUGIN_NAME].get('tab markers', True)
         self.fold_symbols = self._settings[PLUGIN_NAME].get('fold symbols', 2)
-        PythonSTC.__init__(self, parent, -1, options={'tab markers':self.tab_markers, 'fold symbols':self.fold_symbols},
-                           style=style)
+        self.visible_spaces = self._settings[PLUGIN_NAME].get('enable visible spaces', True)
+        self.visible_EOL = self._settings[PLUGIN_NAME].get('enable visible newlines', False)
+        PythonSTC.__init__(self, parent, -1, options={'tab markers':self.tab_markers, 'fold symbols':self.fold_symbols,
+                                                      'visible spaces':self.visible_spaces,
+                                                      'visible EOL':self.visible_EOL}, style=style)
         self._information_popup = None
         self._old_details = None
         self.readonly = readonly
@@ -2976,13 +2979,13 @@ def SetUpEditor(self, tab_size=4, tab_markers=True, m_bg='', m_fg='', caret_fg:
         self.SetTabWidth(tab_size)               # Proscribed tab size for wx
         self.SetUseTabs(False)            # Use spaces rather than tabs, or TabTimmy will complain!
         # White space
-        self.SetViewWhiteSpace(False)   # Don't view white space
+        self.SetViewWhiteSpace(self.visible_spaces)   # View white space
 
         # EOL: Since we are loading/saving ourselves, and the
         # strings will always have \n's in them, set the STC to
         # edit them that way.
         self.SetEOLMode(wx.stc.STC_EOL_LF)
-        self.SetViewEOL(False)
+        self.SetViewEOL(self.visible_EOL)
 
         # No right-edge mode indicator
         self.SetEdgeMode(stc.STC_EDGE_NONE)
diff --git a/src/robotide/preferences/configobj b/src/robotide/preferences/configobj
index 961800486..b7707c94c 160000
--- a/src/robotide/preferences/configobj
+++ b/src/robotide/preferences/configobj
@@ -1 +1 @@
-Subproject commit 9618004862103d51741c8f40b55617c937e910a7
+Subproject commit b7707c94c0317b8f89b704a01525a68eb6c72521
diff --git a/src/robotide/preferences/settings.cfg b/src/robotide/preferences/settings.cfg
index 9c81c440a..a77603581 100644
--- a/src/robotide/preferences/settings.cfg
+++ b/src/robotide/preferences/settings.cfg
@@ -71,6 +71,8 @@ tc_kw_name = '#1A5FB4'
 variable = '#008080'
 background = '#F6F5F4'
 enable auto suggestions = True
+enable visible spaces = True
+enable visible newlines = False
 
 [Grid]
 font size = 10
diff --git a/src/robotide/version.py b/src/robotide/version.py
index dac8ebba8..ee86f696d 100644
--- a/src/robotide/version.py
+++ b/src/robotide/version.py
@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.2.3dev3'
+VERSION = 'v2.2.3dev4'

From b6f8f3fb35109ec0f65a6b3035f91d37f17ce983 Mon Sep 17 00:00:00 2001
From: ChelSlava <chelslava@gmail.com>
Date: Sun, 29 Mar 2026 15:23:25 +0300
Subject: [PATCH 2/3] Fix 'General' settings not available after upgrade
 (blocks startup) (#3013)

- Add migration from settings version 8 to 9 that ensures General section exists with all required keys
- Add safe access to General settings in application.py, mainframe.py, treeplugin.py, and dialog.py
- Use .get() with fallback values instead of direct dictionary access
- This prevents KeyError when user settings file is missing or corrupted

Closes #3000
---
 src/robotide/application/application.py |  5 +++--
 src/robotide/preferences/settings.cfg   |  2 +-
 src/robotide/preferences/settings.py    | 24 ++++++++++++++++++++++++
 src/robotide/ui/mainframe.py            | 16 ++++++++--------
 src/robotide/ui/treeplugin.py           |  6 +++---
 src/robotide/widgets/dialog.py          | 10 +++++-----
 6 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/robotide/application/application.py b/src/robotide/application/application.py
index 31aaa3f6f..8e9fa3cff 100644
--- a/src/robotide/application/application.py
+++ b/src/robotide/application/application.py
@@ -147,8 +147,9 @@ class Message:
         self._controller = Project(self.namespace, self.settings)
         # print(f"DEBUG: application.py RIDE OnInit after defining controller= {self._controller}")
         # Try to get FontInfo as soon as possible
-        font_size = self.settings['General'].get('font size', 12)
-        font_face = self.settings['General'].get('font face', 'Helvetica')
+        general = self.settings.get('General', {})
+        font_size = general.get('font size', 12) if general else 12
+        font_face = general.get('font face', 'Helvetica') if general else 'Helvetica' 
         self.fontinfo = wx.FontInfo(font_size).FaceName(font_face).Bold(False)
         self.fileexplorerplugin = FileExplorerPlugin(self, self._controller)
         self.frame = RideFrame(self, self._controller)
diff --git a/src/robotide/preferences/settings.cfg b/src/robotide/preferences/settings.cfg
index a77603581..02502f559 100644
--- a/src/robotide/preferences/settings.cfg
+++ b/src/robotide/preferences/settings.cfg
@@ -1,4 +1,4 @@
-settings_version = 8
+settings_version = 9
 mainframe size = (1100, 700)
 mainframe position = (50, 30)
 mainframe maximized = False
diff --git a/src/robotide/preferences/settings.py b/src/robotide/preferences/settings.py
index e49abcb65..f41ac037e 100644
--- a/src/robotide/preferences/settings.py
+++ b/src/robotide/preferences/settings.py
@@ -122,6 +122,8 @@ def migrate(self):
             self.migrate_from_6_to_7(self._old_settings)
         if self._old_settings.get(self.SETTINGS_VERSION) == 7:
             self.migrate_from_7_to_8(self._old_settings)
+        if self._old_settings.get(self.SETTINGS_VERSION) == 8:
+            self.migrate_from_8_to_9(self._old_settings)
         self.merge()
 
     def merge(self):
@@ -208,6 +210,28 @@ def migrate_from_7_to_8(self, settings):
                     os.remove(lib_xml_path)
         settings[self.SETTINGS_VERSION] = 8
 
+    def migrate_from_8_to_9(self, settings):
+        """Ensure General section exists with all required keys."""
+        if 'General' not in settings:
+            settings['General'] = {}
+        general = settings['General']
+        defaults = {
+            'font size': 11,
+            'font face': '',
+            'foreground': '#5E5C64',
+            'background': 'light grey',
+            'secondary foreground': '#DEDDDA',
+            'secondary background': '#0A4A8A',
+            'background help': '#A5F173',
+            'foreground text': '#080240',
+            'apply to panels': False,
+            'ui language': 'English'
+        }
+        for key, value in defaults.items():
+            if key not in general:
+                general[key] = value
+        settings[self.SETTINGS_VERSION] = 9
+
     @staticmethod
     def _key_with_underscore(settings, keyname, section=None):
         keyname_old = keyname.replace('_', ' ')
diff --git a/src/robotide/ui/mainframe.py b/src/robotide/ui/mainframe.py
index 05b69efaa..fca0d2070 100644
--- a/src/robotide/ui/mainframe.py
+++ b/src/robotide/ui/mainframe.py
@@ -160,14 +160,14 @@ def __init__(self, application, controller):
         self.tasks = application.settings.get('tasks', False)
         self.doc_language = application.settings.get('doc language', '')
         self._notebook_theme = application.settings.get('notebook theme', 0)
-        self.general_settings = application.settings['General']  # .get_without_default('General')
-        self.color_background_help = self.general_settings.get('background help', (240, 242, 80))
-        self.color_foreground_text = self.general_settings.get('foreground text', (7, 0, 70))
-        self.color_background = self.general_settings.get_without_default('background')
-        self.color_foreground = self.general_settings.get_without_default('foreground')
-        self.font_face = self.general_settings.get('font face', '')
-        self.font_size = self.general_settings.get('font size', 11)
-        self.ui_language = self.general_settings.get('ui language', 'English')
+        self.general_settings = application.settings.get('General', {})
+        self.color_background_help = self.general_settings.get('background help', (240, 242, 80)) if self.general_settings else (240, 242, 80)
+        self.color_foreground_text = self.general_settings.get('foreground text', (7, 0, 70)) if self.general_settings else (7, 0, 70)
+        self.color_background = self.general_settings.get('background', 'light grey') if self.general_settings else 'light grey'
+        self.color_foreground = self.general_settings.get('foreground', '#5E5C64') if self.general_settings else '#5E5C64'
+        self.font_face = self.general_settings.get('font face', '') if self.general_settings else ''
+        self.font_size = self.general_settings.get('font size', 11) if self.general_settings else 11
+        self.ui_language = self.general_settings.get('ui language', 'English') if self.general_settings else 'English' 
         self.main_menu = None
         self._init_ui()
         self.SetIcon(wx.Icon(self._image_provider.RIDE_ICON))
diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py
index 0d315723d..d3d4c846b 100644
--- a/src/robotide/ui/treeplugin.py
+++ b/src/robotide/ui/treeplugin.py
@@ -288,9 +288,9 @@ def __init__(self, parent, action_registerer, settings=None):
         self._RESOURCES_NODE_LABEL = _('External Resources')
         # print(f"DEBUG: treeplugin.py Tree after importing TreeController  __init__ "
         #       f"translated label={self._RESOURCES_NODE_LABEL}")
-        self.theme = settings.get_without_default('General')
-        self.background = self.theme['background']
-        self.foreground = self.theme['foreground']
+        self.theme = settings.get('General', {}) if settings else {}
+        self.background = self.theme.get('background', 'light grey') if self.theme else 'light grey'
+        self.foreground = self.theme.get('foreground', '#5E5C64') if self.theme else '#5E5C64' 
         self._checkboxes_for_tests = False
         self._test_selection_controller = self._create_test_selection_controller()
         self.controller = TreeController(self, action_registerer, settings=settings,
diff --git a/src/robotide/widgets/dialog.py b/src/robotide/widgets/dialog.py
index 66ae827b8..98479f83d 100644
--- a/src/robotide/widgets/dialog.py
+++ b/src/robotide/widgets/dialog.py
@@ -31,16 +31,16 @@ def __init__(self, parent, size=wx.DefaultSize, text=None, color_background=None
         html.HtmlWindow.__init__(self, parent, size=size, style=html.HW_DEFAULT_STYLE)
         from ..preferences import RideSettings
         _settings = RideSettings()
-        self.general_settings = _settings['General']
-        self.color_background_help = color_background if color_background else self.general_settings['background help']
-        self.color_foreground_text = color_foreground if color_foreground else self.general_settings['foreground text']
+        self.general_settings = _settings.get('General', {})
+        self.color_background_help = color_background if color_background else (self.general_settings.get('background help', '#A5F173') if self.general_settings else '#A5F173')
+        self.color_foreground_text = color_foreground if color_foreground else (self.general_settings.get('foreground text', '#080240') if self.general_settings else '#080240')
         self.SetBorders(2)
         self.SetStandardFonts(size=9)
         if text:
             self.set_content(text)
         self.font = self.GetFont()
-        self.font.SetFaceName(self.general_settings['font face'])
-        self.font.SetPointSize(self.general_settings['font size'])
+        self.font.SetFaceName(self.general_settings.get('font face', '') if self.general_settings else '')
+        self.font.SetPointSize(self.general_settings.get('font size', 11) if self.general_settings else 11)
         self.SetFont(self.font)
         self.Refresh(True)
         self.Bind(wx.EVT_KEY_DOWN, self.on_key_down)

From 6a2c09a7c1e1ea0b97787ec6736129c964e1459b Mon Sep 17 00:00:00 2001
From: HelioGuilherme66 <helioxentric@gmail.com>
Date: Sun, 29 Mar 2026 23:39:17 +0100
Subject: [PATCH 3/3] Enable visible spaces and newlines in External/Code
 Editor.

---
 AUTHORS.txt                                   |   1 +
 CHANGELOG.adoc                                |   5 +
 README.adoc                                   |   4 +-
 src/robotide/application/releasenotes.py      |   5 +-
 src/robotide/editor/customsourceeditor.py     |   2 +-
 src/robotide/editor/texteditor.py             |   4 +
 src/robotide/preferences/editors.py           |  10 +-
 src/robotide/preferences/settings.cfg         |   2 +-
 utest/editor/test_customsourceeditor.py       |  15 +-
 .../.robot/ride_settings.cfg                  | 239 ------------------
 utest/resources/setting_utils.py              |   8 +-
 utest/settings/test_settings.py               |   7 +-
 utest/zulu_misc/test_configobj.py             |   8 +-
 13 files changed, 53 insertions(+), 257 deletions(-)
 delete mode 100644 utest/resources/robotdata/test_project/with_project_settings_one/.robot/ride_settings.cfg

diff --git a/AUTHORS.txt b/AUTHORS.txt
index a05135db9..ed8a96cd5 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -32,6 +32,7 @@ Petr Hudeček
 Timothy Alexander
 @2Eagle2
 @bale836
+@chelslava
 @fzuellich
 @ghost
 @goodwillcoding
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index d77736c63..bb5262b57 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -8,6 +8,11 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 == https://github.com/robotframework/RIDE[Unreleased]
 
+=== Added
+- Added on Text Editor, (Preferences->Text Editor) option to *Enable visible spaces* configurable with ``enable visible spaces`` in settings.cfg, with default ``True``.
+- Added on Text Editor, (Preferences->Text Editor) option to *Enable visible newlines* configurable with ``enable visible newlines`` in settings.cfg, with default ``False``.
+- Added on External/Code Editor, both enabled, ``visible spaces`` and ``visible newlines``.
+
 === Fixed
 - Fixed exception seen in console when selecting Tools->Library Finder... on a clean install.
 
diff --git a/README.adoc b/README.adoc
index 543f916b5..3547b65f3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -40,13 +40,13 @@ See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride
 
 Currently, the unit tests are tested on Python 3.10, 3.11 and 3.14.
 We now have an experimental workflow on Fedora Linux 42, with wxPython 4.2.4 and Python 3.14.
-Likewise, the current version of wxPython, is 4.2.4, but RIDE is known to work with 4.0.7, 4.1.1, 4.2.2, 4.2.3 and 4.2.4 versions.
+Likewise, the current version of wxPython, is 4.2.5, but RIDE is known to work with 4.0.7, 4.1.1, 4.2.2, 4.2.3, 4.2.4 and 4.2.5 versions.
 
 (3.9 &lt;= python &lt;= 3.14) Install current released version (*2.2.2*) with:
 
 `pip install -U robotframework-ride`
 
-(3.9 &lt;= python &lt;= 3.14) Install current development version (**2.2.3dev3**) with:
+(3.9 &lt;= python &lt;= 3.14) Install current development version (**2.2.3dev4**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
 
diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index 94b623dbf..b59ddeedb 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -179,6 +179,9 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Added on Text Editor, (Preferences->Text Editor) options to <b>Enable visible spaces</b> and
+ <b>Enable visible newlines</b>.</li>
+<li>Added on External/Code Editor, both enabled, <b>visible spaces<b> and <b>visible newlines<b>.</li>
 <li>Fixed exception seen in console when selecting Tools->Library Finder... on a clean install.</li>
 <li>The Test Suites Explorer can be visible or hidden with F12 (View->View Test Suites Explorer). Pane can be made
  floating or docked, by dragging or by double-clicking its top bar.</li>
@@ -244,7 +247,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">python -m robotide.postinstall -install</pre>
 <p>or</p>
 <pre class="literal-block">ride_postinstall.py -install</pre>
-<p>RIDE {VERSION} was released on 28/March/2026.</p>
+<p>RIDE {VERSION} was released on 29/March/2026.</p>
 <br/>
 <!-- 
 <h3>Celebrate the bank holiday, 1st December, Restoration of the Independence of Portugal (from Spain in 1640)!!</h3>
diff --git a/src/robotide/editor/customsourceeditor.py b/src/robotide/editor/customsourceeditor.py
index d1a5f1f41..317fdd360 100644
--- a/src/robotide/editor/customsourceeditor.py
+++ b/src/robotide/editor/customsourceeditor.py
@@ -233,7 +233,7 @@ def __init__(self, parent, main_frame, filepath=None):
         wx.Panel.__init__(self, parent, size=wx.Size(1, 1))
         self.mainFrame = main_frame
         self.editor = SourceCodeEditor(self, options={'tab markers':True, 'fold symbols':2,
-                                                      'visible spaces':True, 'visible EOL':False})
+                                                      'visible spaces':True, 'visible EOL':True})
         self.editor.RegisterModifiedEvent(self.on_code_modified)
         parent.SetName(f'Code Editor: {filepath}')
         """
diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index 1f30bdf55..9c3c392ef 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -3091,6 +3091,8 @@ def on_settings_changed(self, message):
         if section == PLUGIN_NAME:
             self.set_styles(self._readonly)  # DEBUG: When on read-only file changing background color ignores flag
             self.editor.autocomplete = self.settings[PLUGIN_NAME].get(AUTO_SUGGESTIONS, False)
+            self.editor.visible_spaces = self.settings[PLUGIN_NAME].get('enable visible spaces', True)
+            self.editor.visible_EOL = self.settings[PLUGIN_NAME].get('enable visible newlines', False)
             caret_colour = self.settings[PLUGIN_NAME].get('setting', 'black')
             caret_colour = self.editor.get_visible_color(caret_colour)
             self.editor.SetCaretForeground(Colour(caret_colour))
@@ -3179,6 +3181,8 @@ def set_styles(self, readonly=False):
                                                                fore=foreground))
         self.editor.StyleSetBackground(wx.stc.STC_STYLE_DEFAULT, background)
         self.editor.SetZoom(self._zoom_factor())
+        self.editor.SetViewWhiteSpace(self.editor.visible_spaces)
+        self.editor.SetViewEOL(self.editor.visible_EOL)
         self.editor.Refresh()
 
     def _get_word_and_length(self, current_position):
diff --git a/src/robotide/preferences/editors.py b/src/robotide/preferences/editors.py
index e25e44deb..48ed5e4ba 100644
--- a/src/robotide/preferences/editors.py
+++ b/src/robotide/preferences/editors.py
@@ -226,11 +226,19 @@ def on_reset(self, event):
 
     def _create_text_config_editor(self):
         settings = self._settings
-        sizer = wx.FlexGridSizer(rows=2, cols=2, vgap=10, hgap=10)
+        sizer = wx.FlexGridSizer(rows=4, cols=2, vgap=10, hgap=10)
         l_auto_suggest, editor = pdiag.boolean_editor(self, settings, 'enable auto suggestions',
                                                 _('Enable auto suggestions'))
         set_colors(l_auto_suggest, self.background_color, self.foreground_color)
         sizer.AddMany([l_auto_suggest, editor])
+        l_visible_spaces, editor = pdiag.boolean_editor(self, settings, 'enable visible spaces',
+                                                _('Enable visible spaces'))
+        set_colors(l_visible_spaces, self.background_color, self.foreground_color)
+        sizer.AddMany([l_visible_spaces, editor])
+        l_visible_newlines, editor = pdiag.boolean_editor(self, settings, 'enable visible newlines',
+                                                _('Enable visible newlines'))
+        set_colors(l_visible_newlines, self.background_color, self.foreground_color)
+        sizer.AddMany([l_visible_newlines, editor])
         return sizer
 
 
diff --git a/src/robotide/preferences/settings.cfg b/src/robotide/preferences/settings.cfg
index 02502f559..3bb97fa6d 100644
--- a/src/robotide/preferences/settings.cfg
+++ b/src/robotide/preferences/settings.cfg
@@ -72,7 +72,7 @@ variable = '#008080'
 background = '#F6F5F4'
 enable auto suggestions = True
 enable visible spaces = True
-enable visible newlines = False
+enable visible newlines = True
 
 [Grid]
 font size = 10
diff --git a/utest/editor/test_customsourceeditor.py b/utest/editor/test_customsourceeditor.py
index 41f047ddd..56b52f408 100644
--- a/utest/editor/test_customsourceeditor.py
+++ b/utest/editor/test_customsourceeditor.py
@@ -32,6 +32,8 @@ def setUp(self):
         self._settings.add_section(PLUGIN_NAME)
         self.tab_markers = self._settings[PLUGIN_NAME].get('tab markers', True)
         self.fold_symbols = self._settings[PLUGIN_NAME].get('fold symbols', 2)
+        self.visible_spaces = self._settings[PLUGIN_NAME].get('enable visible spaces', True)
+        self.visible_EOL = self._settings[PLUGIN_NAME].get('enable visible newlines', True)
         self.frame = wx.Frame(None)
         # Uncomment next line (and MainLoop in tests) if you want to see the app
         # self.frame.Show()
@@ -60,8 +62,9 @@ def test_call_source_editor(self):
         # self.panel.Center()
         with open(datafilereader.TESTCASEFILE_WITH_EVERYTHING, "r") as fp:
             content = fp.read()
-        self.editor = SourceCodeEditor(self.panel, options={'tab markers': True, 'fold symbols': 2})
-        self.editor.SetUpEditor()
+        self.editor = SourceCodeEditor(self.panel, options={'tab markers': True, 'fold symbols': 2,
+                                                            'visible spaces':True, 'visible EOL':True})
+        self.editor.SetUpEditor(eoptions={'visible spaces':True, 'visible EOL':True})
         self.editor.SetValue(content)
         self.editor.SetEditable(True)
         self.editor.Fit()
@@ -108,6 +111,8 @@ def setUp(self):
         self._settings.add_section(PLUGIN_NAME)
         self.tab_markers = self._settings[PLUGIN_NAME].get('tab markers', True)
         self.fold_symbols = self._settings[PLUGIN_NAME].get('fold symbols', 2)
+        self.visible_spaces = self._settings[PLUGIN_NAME].get('enable visible spaces', True)
+        self.visible_EOL = self._settings[PLUGIN_NAME].get('enable visible newlines', True)
         self.frame = wx.Frame(None)
         self.wkpath = None
         # Uncomment next line (and MainLoop in tests) if you want to see the app
@@ -218,7 +223,8 @@ def test_call_python_editor(self):
         with open(datafilereader.TESTCASEFILE_WITH_EVERYTHING, "r") as fp:
             content = fp.read()
         for style in range(4):
-            self.editor = PythonSTC(self.frame, -1, options={'tab markers': True, 'fold symbols': style})
+            self.editor = PythonSTC(self.frame, -1, options={'tab markers': True, 'fold symbols': style,
+                                                      'visible spaces':True, 'visible EOL':True})
         self.editor.SetSize(wx.Size(800, 600))
         self.editor.SetValue(content)
         self.editor.SetEditable(True)
@@ -243,7 +249,8 @@ def test_other_calls_python_editor(self):
         wx.CallLater(10000, self.app.ExitMainLoop)
         with open(datafilereader.TESTCASEFILE_WITH_EVERYTHING, "r") as fp:
             content = fp.read()
-        self.editor = PythonSTC(self.frame, -1, options={'tab markers': True, 'fold symbols': 2})
+        self.editor = PythonSTC(self.frame, -1, options={'tab markers': True, 'fold symbols': 2,
+                                                      'visible spaces':True, 'visible EOL':True})
         self.editor.SetSize(wx.Size(800, 600))
         self.editor.SetValue(content)
         self.editor.SetEditable(True)
diff --git a/utest/resources/robotdata/test_project/with_project_settings_one/.robot/ride_settings.cfg b/utest/resources/robotdata/test_project/with_project_settings_one/.robot/ride_settings.cfg
deleted file mode 100644
index f4b983231..000000000
--- a/utest/resources/robotdata/test_project/with_project_settings_one/.robot/ride_settings.cfg
+++ /dev/null
@@ -1,239 +0,0 @@
-settings_version = 8
-mainframe size = (1100, 700)
-mainframe position = (302, 69)
-mainframe maximized = False
-list variable columns = 4
-list col min width = 120
-list col max width = 350
-# Auto imports is a list of libraries whose keywords are always visible in keyword completion.
-# If the library needs arguments, they follow the library name with '|' as a separator.
-# Example: auto imports = ['MyLib', 'AnotherLibraryWithArgs|arg1|arg2']
-auto imports = []
-# Locations to add into PYTHONPATH. Non-absolute paths are considered relative
-# to the directory where RIDE starts. Backslashes must be escaped by doubling
-# them (\\). Alternatively it is possible to use forward slash (/) as the path
-# separator regardless the operating systems.
-# Example: pythonpath = ['c:/robot/testlibs', 'd:/project/resources']
-pythonpath = []
-library xml directories = []
-txt number of spaces = 4
-txt format separator = 'space'
-line separator = 'native'
-default file format = 'robot'
-tasks = False
-reformat = False
-# doc language: Test Suites will have sections and parameters in the selected language
-# doc language: Possible values are the ones from Robot Framework >= 6.0.
-doc language = ['En']
-# the style of the tabs in notebook pages, Edit, Text, Run. Values from 0 to 5.
-notebook theme = 0
-AUI Perspective = 'layout2|name=right_pane;caption=;minimode=1;state=67373052;dir=2;layer=0;row=0;pos=0;prop=100000;bestw=1;besth=1;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|name=notebook_editors;caption=;minimode=1;state=768;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=0;besth=0;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|name=maintoolbar;caption=;minimode=1;state=67379964;dir=1;layer=10;row=0;pos=331;prop=100000;bestw=327;besth=26;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|name=tree_content;caption=Test Suites;minimode=1;state=264188;dir=4;layer=0;row=0;pos=0;prop=100000;bestw=275;besth=250;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|name=file_manager;caption=Files;minimode=1;state=264188;dir=4;layer=0;row=0;pos=1;prop=100000;bestw=275;besth=286;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|dock_size(2,0,0)=10|dock_size(5,0,0)=10|dock_size(1,10,0)=28|dock_size(4,0,0)=225|'
-AUI NB Perspective = 'panel689a54ef0000143400000002=0,1,+2@layout2|name=dummy;caption=;minimode=1;state=67372030;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=421;besth=308;minw=421;minh=308;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|name=panel689a54ef0000143400000002;caption=;minimode=1;state=67371516;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=0;besth=0;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1;notebookid=-1;transparent=255|dock_size(5,0,0)=10|'
-version_shown = 'v2.2dev41'
-check for updates = True
-last update check = 1757977585.0415273
-robot types = ['robot', 'resource', 'txt', 'tsv']
-user keyword settings open = False
-test case settings open = False
-default directory = '/home2/helio/github/RIDE/utest/resources/robotdata/test_project/with_project_settings_one'
-install root = '/home2/helio/github/RIDE/src/robotide'
-executable = '/opt/venv/bin/python'
-test case file settings open = False
-init file settings open = False
-last_settings_path = '/home2/helio/github/RIDE/utest/resources/robotdata/test_project/with_project_settings_one/.robot/ride_settings_1961.cfg'
-
-[General]
-font size = 11
-font face = 'Source Code Pro'
-foreground = '#8FF0A4'
-background = '#008080'
-secondary foreground = '#FFFF00'
-secondary background = '#4A060B'
-background help = '#FFBE6F'
-foreground text = '#613583'
-apply to panels = True
-ui language = 'English'
-# file manager: When set to full path or known command use it to open folders
-;file manager = None
-
-[Text Edit]
-font size = 10
-zoom factor = 0
-font face = 'Noto Sans'
-# caret style = 'line': or caret style = 'block' (better visibility), it will use the color of 'setting' or better calculated
-caret style = 'block'
-# Fold symbols are as described at wxPython demo:
-# 0 == Arrow pointing right for contracted folders, arrow pointing down for expanded
-# 1 == Plus for contracted folders, minus for expanded
-# 2 == Like a flattened tree control using circular headers and curved joins
-# 3 == Like a flattened tree control using square headers
-fold symbols = 2
-# Show tab indentation markers
-tab markers = True
-argument = '#bb8844'
-comment = '#613583'
-error = '#F66151'
-gherkin = '#3584E4'
-heading = '#036EA8'
-import = '#9141AC'
-keyword = '#1C71D8'
-separator = '#5E5C64'
-setting = '#26A269'
-syntax = '#613583'
-tc_kw_name = '#1A5FB4'
-variable = '#008080'
-background = '#F6F5F4'
-enable auto suggestions = True
-
-[Grid]
-font size = 10
-font face = ''
-zoom factor = 0
-fixed font = False
-col size = 150
-max col size = 450
-auto size cols = False
-text user keyword = 'blue'
-text library keyword = '#0080C0'
-text variable = 'forest green'
-text unknown variable = 'purple'
-text commented = 'firebrick'
-text string = 'black'
-text empty = 'black'
-background assign = '#CADEF7'
-background keyword = '#CADEF7'
-background mandatory = '#D3D3D3'
-background optional = '#F9D7BA'
-background must be empty = '#C0C0C0'
-background unknown = '#E8B636'
-background error = '#FF9385'
-background highlight = '#FFFF77'
-word wrap = True
-enable auto suggestions = True
-# filter newlines: When enabled, newlines are not shown as \n in the cells. On Windows this may cause a lock.
-filter newlines = False
-
-[Plugins]
-[[Test Runner]]
-font size = 10
-font face = 'Noto Sans'
-foreground = '#F6F5F4'
-background = '#241F31'
-error = 'red'
-use colors = True
-fail color = '#FF8E8E'
-pass color = '#9FCC9F'
-skip color = 'yellow'
-profile_name = 'robot'
-run_profiles = [('other profile', 'robot')]
-auto_save = False
-confirm run = True
-show_console_log = True
-show_message_log = True
-active_status_bar = True
-sash_position = 200
-_enabled = True
-browser = 'google-chrome'
-robot_arguments = '--variable MY_VAR:"This the variable at project one"'
-
-[[File Explorer]]
-font size = 11
-font face = 'Source Code Pro'
-foreground = '#8FF0A4'
-background = '#008080'
-secondary foreground = 'black'
-secondary background = 'light grey'
-background help = '#FFBE6F'
-foreground text = '#613583'
-own colors = False
-opened = True
-docked = True
-_enabled = True
-
-[[Tree]]
-font size = 11
-font face = 'Source Code Pro'
-foreground = '#8FF0A4'
-background = '#008080'
-secondary foreground = 'black'
-secondary background = 'light grey'
-background help = '#FFBE6F'
-foreground text = '#613583'
-own colors = False
-opened = True
-docked = True
-_enabled = True
-
-[[Preview]]# This plugin is not usable since RIDE 2.1 (and Robot Framework 3.2.1)
-format = 'HTML'
-_enabled = False
-
-[[Run Anything]]# This is here just because of unit tests
-foreground = 'black'
-brackground = 'light grey'
-configs = []
-_enabled = True
-
-[[Library Finder]]
-_enabled = True
-[[[AppiumLibrary]]]
-command = ['%executable -m pip install -U robotframework-appiumlibrary']
-documentation = 'https://serhatbolsu.github.io/robotframework-appiumlibrary/AppiumLibrary.html'
-[[[AxeLibrary]]]
-command = ['%executable -m pip install -U robotframework-axelibrary']
-documentation = 'https://robotframework-axelibrary.netlify.app/'
-[[[Browser]]]
-command = ['node -v', '%executable -m pip install -U robotframework-browser', '%executable -m Browser.entry init']
-documentation = 'https://marketsquare.github.io/robotframework-browser/Browser.html'
-[[[CSVLibrary]]]
-command = ['%executable -m pip install -U robotframework-csvlibrary']
-documentation = 'https://rawgit.com/s4int/robotframework-CSVLibrary/master/doc/CSVLibrary.html'
-[[[DatabaseLibrary]]]
-command = ['%executable -m pip install -U robotframework-databaselibrary']
-documentation = 'https://marketsquare.github.io/Robotframework-Database-Library/'
-[[[DataDriver]]]
-command = ['%executable -m pip install --upgrade robotframework-datadriver[XLS]']
-documentation = 'https://github.com/Snooz82/robotframework-datadriver'
-[[[ImageHorizonLibrary]]]
-command = ['%executable -m pip install -U robotframework-imagehorizonlibrary']
-documentation = 'https://eficode.github.io/robotframework-imagehorizonlibrary/doc/ImageHorizonLibrary.html'
-[[[RequestsLibrary]]]
-command = ['%executable -m pip install -U robotframework-requests']
-documentation = 'https://marketsquare.github.io/robotframework-requests/doc/RequestsLibrary.html'
-[[[SeleniumLibrary]]]
-command = ['%executable -m pip install -U robotframework-seleniumlibrary']
-documentation = 'https://robotframework.org/SeleniumLibrary/SeleniumLibrary.html'
-[[[SikuliLibrary]]]
-command = ['%executable -m pip install -U https://github.com/MarketSquare/robotframework-SikuliLibrary/releases/download/v2.0.5/robotframework_sikulilibrary-2.0.5-py3-none-any.whl']
-documentation = 'https://marketsquare.github.io/robotframework-SikuliLibrary/docs/SikuliLibrary.html'
-[[[SSHLibrary]]]
-command = ['%executable -m pip install -U robotframework-sshlibrary']
-documentation = 'https://marketsquare.github.io/SSHLibrary/SSHLibrary.html'
-[[Log]]
-log_to_console = False
-log_to_file = True
-_enabled = True
-[[Recent Files]]
-recent_files = ['/home2/helio/github/RIDE/utest/resources/robotdata/test_project/with_project_settings_one', '/home/helio/Test/Robot/test_empty', '/home2/helio/Test/Robot/test_empty', '/home2/helio/Test/Robot/testsuite']
-max_number_of_files = 4
-_enabled = True
-[[Spec Importer]]
-_enabled = True
-[[Editor]]
-_enabled = True
-[[Text Editor]]
-_enabled = True
-[[Keyword Search]]
-_enabled = True
-[[Test Search]]
-_enabled = True
-[[Shortcut]]
-desktop_shortcut_exists = False
-initial_project = None
-_enabled = True
-[[Parser Log]]
-log_to_console = False
-log_to_file = True
-_enabled = True
-[[Editor de Grelha]]
-_enabled = True
diff --git a/utest/resources/setting_utils.py b/utest/resources/setting_utils.py
index 1e12e0236..ca9c7aa91 100644
--- a/utest/resources/setting_utils.py
+++ b/utest/resources/setting_utils.py
@@ -47,9 +47,13 @@ def _remove_path(self, path):
 
     def _check_content(self, expected_dict, check_self_settings=True):
         settings = Settings(self.user_settings_path)
-        self.assertEqual(settings.config_obj, expected_dict)
+        # self.assertEqual(settings.config_obj, expected_dict)
+        for key, value in expected_dict.items():
+            assert settings[key] == value
         if check_self_settings:
-            self.assertEqual(self.settings.config_obj, expected_dict)
+            # self.assertEqual(self.settings.config_obj, expected_dict)
+            for key, value in expected_dict.items():
+                assert self.settings[key] == value
 
     def _write_settings(self, content, path=None):
         f = open(self._get_path(path), 'wb')
diff --git a/utest/settings/test_settings.py b/utest/settings/test_settings.py
index f8df88767..a67ff8f65 100644
--- a/utest/settings/test_settings.py
+++ b/utest/settings/test_settings.py
@@ -23,7 +23,10 @@
     ConfigurationError, initialize_settings, SettingsMigrator
 from robotide.preferences.configobj.src.configobj import UnreprError
 
-from resources.setting_utils import TestSettingsHelper
+try:
+    from resources.setting_utils import TestSettingsHelper
+except ModuleNotFoundError:
+    from ..resources.setting_utils import TestSettingsHelper
 
 
 class TestInvalidSettings(TestSettingsHelper):
@@ -342,7 +345,7 @@ def test_initialize_settings_does_merge_when_settings_exists(self):
         initialize_settings(self.settings_path, 'user.cfg')
         self._check_content(
             {'foo': 'new value', 'hello': 'world',
-             SettingsMigrator.SETTINGS_VERSION: 8}, False)
+             SettingsMigrator.SETTINGS_VERSION: 9}, False)
 
     def test_initialize_settings_raises_exception_when_invalid_user_settings(
             self):
diff --git a/utest/zulu_misc/test_configobj.py b/utest/zulu_misc/test_configobj.py
index 649f3acd6..4127d9c36 100644
--- a/utest/zulu_misc/test_configobj.py
+++ b/utest/zulu_misc/test_configobj.py
@@ -559,13 +559,13 @@ def test_validate(self, val):
             'key1 = Hello',
             '',
             '# section comment',
-            '[section]# inline comment',
+            '[section] # inline comment',
             '# key1 comment',
             'key1 = 6',
             '# key2 comment',
             'key2 = True',
             '# subsection comment',
-            '[[sub-section]]# inline comment',
+            '[[sub-section]] # inline comment',
             '# another key1 comment',
             'key1 = 3.0'
         ]
@@ -577,9 +577,9 @@ def test_writing_empty_values(self):
             'key2 =# a comment',
         ]
         cfg = ConfigObj(config_with_empty_values)
-        assert cfg.write() == ['', 'key1 = ""', 'key2 = ""# a comment']
+        assert cfg.write() == ['', 'key1 = ""', 'key2 = "" # a comment']
         cfg.write_empty_values = True
-        assert cfg.write() == ['', 'key1 = ', 'key2 = # a comment']
+        assert cfg.write() == ['', 'key1 = ', 'key2 =  # a comment']
 
 
 class TestUnrepr(object):