Improves auto-complete in Grid Editor

Author: HelioGuilherme66

CHANGELOG.adoc

@@ -18,6 +18,7 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 when selecting in Tree shows the filename in StatusBar.
 
 === Changed
+- Improved auto-complete in Grid Editor, to allow several matches
 - Changed some informative dialogs and JSON Editor to use the customized colors.
 - Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.
 - On Windows ignore false modification on files when opening Test Suites, causing confirmation dialog.

README.adoc

@@ -41,7 +41,7 @@ Likewise, the current version of wxPython, is 4.2.3, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 <= python <= 3.13) Install current development version (**2.2dev25**) with:
+(3.8 <= python <= 3.13) Install current development version (**2.2dev26**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
 

src/robotide/application/CHANGELOG.html

@@ -14,6 +14,8 @@
 Added divided Status Bar. Left side for main window, right side for Plugins. Working example in Text Editor,
 when selecting in Tree shows the filename in StatusBar.
 </li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_changed"></a>1.2. Changed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+Improved auto-complete in Grid Editor, to allow several matches
+</li><li class="listitem">
 Changed some informative dialogs and JSON Editor to use the customized colors.
 </li><li class="listitem">
 Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.

src/robotide/application/releasenotes.py

@@ -172,6 +172,7 @@ def set_content(self, html_win, content):
 </ul>
 <p><strong>New Features and Fixes Highlights</strong></p>
 <ul class="simple">
+<li>Improved auto-complete in Grid Editor, to allow several matches.</li>
 <li>Fixed white blocks on Tree due to failed animation when test execution is too rapid, causing crash on Windows.</li>
 <li>Added Settings Editor button to Preferences dialog, to edit settings.cfg.</li>
 <li>Created backup of settings.cfg to allow recovering some settings when broken upgrades.</li>
@@ -237,7 +238,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 15/May/2025.</p>
+<p>RIDE {VERSION} was released on 18/May/2025.</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>

src/robotide/editor/contentassist.py

@@ -263,38 +263,39 @@ def on_focus_lost(self, event, set_value=True):
         event.Skip()
         if not self._popup.is_shown():
             return
-        if self.gherkin_prefix:
-            value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
-        else:
-            value = self._popup.get_value() or self.GetValue()
+        value = self._get_popup_suggestion()
         if set_value and value:
             self.SetValue(value)
             self.SetInsertionPoint(len(value))  # DEBUG was self.Value
         else:
+            # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase on_focus_lost CALL CLEAR {value}")
             self.Clear()
         self.hide()
 
-    def fill_suggestion(self):
+    def _get_popup_suggestion(self, in_value=None):
         initial_value = self.GetValue()
-        popup_value = self._popup.get_value()
-        # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion initial_value={initial_value} \n"
-        #       f"popup_value={popup_value}")
-        if popup_value.lower() in initial_value.lower():
+        if not in_value:
+            popup_value = self._popup.get_value()
+        else:
+            popup_value = in_value
+        if popup_value and popup_value.lower() in initial_value.lower():
             initial_value = initial_value.replace(initial_value, '')
         parts = initial_value.split()
         for p in parts:
-            if popup_value.lower().startswith(p.strip('}])').lower()):
+            if popup_value and popup_value.lower().startswith(p.strip('}])').lower()):
                 idx = initial_value.index(p)
                 initial_value = initial_value[:idx]
-                # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion FOUND p={p} "
-                #       f"new initial_value={initial_value}")
                 break
         if self.gherkin_prefix:
-            initial_value = initial_value.replace(self.gherkin_prefix,'')  # Should be left replace
+            initial_value = initial_value.replace(self.gherkin_prefix, '')  # Should be left replace
             value = self.gherkin_prefix + initial_value + popup_value  # or self.GetValue()
         else:
             value = initial_value + popup_value  # or self.GetValue()
-        print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion writting value={value}")
+        return value
+
+    def fill_suggestion(self, value=None):
+        value = self._get_popup_suggestion(value)
+        # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion writting value={value}")
         if value:
             wrapper_view = self.GetParent().GetParent()
             if hasattr(wrapper_view, 'open_cell_editor'):
@@ -621,15 +622,14 @@ def select_and_scroll(self, key_code):
             pos = self._selection + 14 if count - self._selection > 14 else count - 1
         elif key_code == wx.WXK_PAGEUP:
             pos = self._selection - 14 if self._selection > 14 else 0
-        self._select_and_scroll(pos)
+        return self._select_and_scroll(pos)
 
     def _select_and_scroll(self, selection):
         self._selection = selection
         self._list.Select(self._selection)
         self._list.EnsureVisible(self._selection)
         value = self.get_value()
-        if value:
-            self._parent.SetValue(value)
+        return value
 
     def dismiss(self):
         if not self._list.HasFocus():

src/robotide/version.py

@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.2dev25'
+VERSION = 'v2.2dev26'

utest/editor/test_z_kweditor_plugin.py

@@ -248,16 +248,16 @@ def setUp(self):
         self._registered_editors = {}
         self.creator = EditorCreator(self._register)
         self.creator.register_editors()
-
+        """
         for ridx, rdata in enumerate(DATA):
             for cidx, cdata in enumerate(rdata):
                 self._grid.kweditor.write_cell(ridx, cidx, cdata, update_history=False)
-
+        """
         # Uncomment next line (and MainLoop in tests) if you want to see the app
-        self.frame.Show()
+        # self.frame.Show()
         self.SHOWING = True
         self.frame.Center()
-        wx.CallLater(1000, self.app.MainLoop)
+        # wx.CallLater(1000, self.app.MainLoop)
 
     def _register(self, iclass, eclass):
         self._registered_editors[iclass] = eclass
@@ -294,6 +294,11 @@ def tearDown(self):
         if os.path.exists(DATADIR):
             shutil.rmtree(DATADIR, ignore_errors=True)
 
+    def setup_data(self):
+        for ridx, rdata in enumerate(DATA):
+            for cidx, cdata in enumerate(rdata):
+                self._grid.kweditor.write_cell(ridx, cidx, cdata, update_history=False)
+
     """
     def test_enable(self):
         self.plugin.enable()
@@ -315,6 +320,8 @@ def test_disable(self):
     """
 
     def test_show(self):
+        self.setup_data()
+        self.frame.Show()
         # show = self.frame.Children
         # print(f"DEBUG: test_show is children={[n.Name for n in show]}")
         # tabs = self._grid.kweditor.GetParent().GetName()
@@ -323,10 +330,12 @@ def test_show(self):
         show = self._grid.kweditor.has_focus()
         assert show  # is not None
         # Uncomment next lines if you want to see the app
-        # wx.CallLater(5000, self.app.ExitMainLoop)
+        wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     def test_on_comment_cells(self):
+        self.setup_data()
+        self.frame.Show()
         # self.creator.editor_for(self.app.plugin, self._panel, self.frame.tree)
         self._grid.kweditor.SelectBlock(2, 2, 2, 2)
         sel = self._grid.kweditor.selection
@@ -342,6 +351,8 @@ def test_on_comment_cells(self):
     """ Clipboard tests moved from test_grid.py to here """
     @pytest.mark.skip()
     def test_copy_one_cell(self):
+        self.setup_data()
+        self.frame.Show()
         print("")
         for row in range(3):
             text = f"{row}: "
@@ -363,6 +374,8 @@ def test_copy_row(self):
 
     @pytest.mark.skip()
     def test_copy_block(self):
+        self.setup_data()
+        self.frame.Show()
         self._copy_block_and_verify((0, 0, 2, 2), DATA)
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
@@ -376,22 +389,28 @@ def _copy_block_and_verify(self, block, exp_content):
         self._verify_grid_content(DATA)
 
     def test_cut_one_cell(self):
+        self.setup_data()
+        self.frame.Show()
         self._cut_block_and_verify((0, 0, 0, 0), [['kw1']],
                                    [['', '', '']] + DATA[1:])
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     def test_cut_row(self):
+        self.setup_data()
+        self.frame.Show()
         self._cut_block_and_verify((2, 0, 2, 2), [DATA[2]], DATA[:2])
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     def test_cut_block(self):
+        self.setup_data()
+        self.frame.Show()
         self._cut_block_and_verify((0, 0, 2, 2), DATA, [])
         # Uncomment next lines if you want to see the app
-        # wx.CallLater(5000, self.app.ExitMainLoop)
+        wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     def _cut_block_and_verify(self, block, exp_clipboard, exp_grid):
@@ -401,6 +420,8 @@ def _cut_block_and_verify(self, block, exp_clipboard, exp_grid):
         self._verify_grid_content(exp_grid)
 
     def test_undo_with_cut(self):
+        self.setup_data()
+        self.frame.Show()
         self._cut_block((0, 0, 0, 0))
         self._grid.kweditor.undo()
         self._verify_grid_content(DATA)
@@ -418,6 +439,8 @@ def test_undo_with_cut(self):
         # self.app.MainLoop()
 
     def test_multiple_levels_of_undo(self):
+        self.setup_data()
+        self.frame.Show()
         self._cut_block((0, 0, 0, 0))
         self._cut_block((2, 0, 2, 2))
         # We have problems here. We need undo for each cell removed
@@ -436,6 +459,8 @@ def _cut_block(self, block):
         self._grid.kweditor.cut()
 
     def test_paste_one_cell(self):
+        self.setup_data()
+        self.frame.Show()
         self._copy_and_paste_block((1, 0, 1, 0), (3, 0, 3, 0), DATA + [['kw2']])
         # These tests are not independent
         self._copy_and_paste_block((1, 0, 1, 0), (0, 3, 0, 3),
@@ -445,19 +470,25 @@ def test_paste_one_cell(self):
         # self.app.MainLoop()
 
     def test_paste_row(self):
+        self.setup_data()
+        self.frame.Show()
         self._copy_and_paste_block((2, 0, 2, 2), (3, 1, 3, 1), DATA + [[''] + DATA[2]])
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     def test_paste_block(self):
+        self.setup_data()
+        self.frame.Show()
         self._copy_and_paste_block((0, 0, 2, 2), (4, 0, 4, 0), DATA + [['']] + DATA)
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
         # self.app.MainLoop()
 
     # @pytest.mark.skip()
     def test_paste_over(self):
+        self.setup_data()
+        self.frame.Show()
         self._copy_and_paste_block((1, 0, 1, 1), (0, 0, 0, 0), [DATA[1]] + DATA[1:])
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)
@@ -480,6 +511,8 @@ def _verify_grid_content(self, data):
                     assert value == ''
 
     def test_simple_undo(self):
+        self.setup_data()
+        self.frame.Show()
         self._grid.kweditor.SelectBlock(*(0, 0, 0, 0))
         self._grid.kweditor.cut()
         self._grid.kweditor.undo()
@@ -490,7 +523,8 @@ def test_simple_undo(self):
 
     # @pytest.mark.skip()
     def test_contentassist_dialog(self):
-        suggestions = SuggestionSource(None, self.app.project.controller)
+        suggestions = SuggestionSource(None, self.test_case)
+        suggestions.update_from_local(['No Operation', 'Log Many', 'Log', '${CURDIR}'], 'en')
         dlg = ContentAssistPopup(self._grid.kweditor, suggestions)
         dlg.show(600, 400, 20)
         result = dlg.content_assist_for('Log Many')
@@ -500,6 +534,10 @@ def test_contentassist_dialog(self):
         dlg._move_x_where_room(800)
         dlg._move_y_where_room(400, 20)
         # dlg.reset()
+        value = dlg.content_assist_value('${CUR')
+        dlg.select_and_scroll(wx.WXK_DOWN)
+        dlg.dismiss()
+        dlg.hide()
         # wx.CallLater(4000, dlg.hide)
         # Uncomment next lines if you want to see the app
         # wx.CallLater(5000, self.app.ExitMainLoop)