Merge pull request #2951 from HelioGuilherme66/improve_kweditor

Improve kweditor auto-complete

Author: HelioGuilherme66

.github/workflows/package.yml

@@ -0,0 +1,109 @@
+name: Linux
+on:
+  push:
+    branches-ignore:
+      - '**/sources/**'
+      - '**/windows/**'
+      - '**/macos/**'
+    paths-ignore:
+      - '.github/workflows/sources.yml'
+      - '.github/workflows/sonar.yml'
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows.yml'
+      - 'tools/**'
+      - 'rtest/**'
+      - 'doc/**'
+      - '.appveyor.yml'
+      - '.coveragerc'
+      - '.gitattributes'
+      - '.pylintrc'
+      - '.travis.yml'
+      - '.whitesource'
+      - 'AUTHORS.txt'
+      - 'BUILD.rest'
+      - 'CHANGELOG.adoc'
+      - 'CONTRIBUTING.adoc'
+      - 'COPYRIGHT.txt'
+      - 'LICENSE.txt'
+      - 'MANIFEST.in'
+      - 'README.adoc'
+      - 'README.rest'
+      - 'rfgen.py'
+      - 'tox.ini'
+  pull_request:
+    paths-ignore:
+      - '.github/workflows/sources.yml'
+      - '.github/workflows/sonar.yml'
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows.yml'
+      - 'tools/**'
+      - 'rtest/**'
+      - 'doc/**'
+      - '.appveyor.yml'
+      - '.coveragerc'
+      - '.gitattributes'
+      - '.pylintrc'
+      - '.travis.yml'
+      - '.whitesource'
+      - 'AUTHORS.txt'
+      - 'BUILD.rest'
+      - 'CHANGELOG.adoc'
+      - 'CONTRIBUTING.adoc'
+      - 'COPYRIGHT.txt'
+      - 'LICENSE.txt'
+      - 'MANIFEST.in'
+      - 'README.adoc'
+      - 'README.rest'
+      - 'rfgen.py'
+      - 'tox.ini'
+
+jobs:
+  fedora:
+    name: Fedora py313
+    runs-on: ubuntu-22.04
+    container:
+      image: fedora:41
+      options: --privileged
+    steps:
+    - name: Configure container environment
+      run: |
+        sudo dnf update -y
+        sudo dnf install -y git
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
+    - uses: actions/[email protected]
+      with:
+        submodules: false
+    - name: Setup environment
+      run: |
+        sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip python3-tkinter psmisc
+        # sudo dnf downgrade -y mesa* --refresh
+        git submodule update --init --recursive
+        pip install -r requirements-dev.txt
+        pip install robotframework
+    - name: Run tests
+      run: |
+        Xvfb &
+        export DISPLAY=:0
+        export GITHUB_ACTIONS=True
+        git submodule update --init --recursive
+        invoke test-ci
+    - uses: actions/upload-artifact@v4
+      with:
+        name: coverage-report
+        include-hidden-files: true
+        path: |
+          .coverage.1
+          .coverage.2
+          .coverage-reports/coverage.xml
+          .coverage-reports/htmlcov
+    - name: Create Package
+      run: |
+        git submodule update --init --recursive
+        pip install -r requirements-dev.txt
+        python -m build
+    - uses: actions/upload-artifact@v4
+      with:
+        name: package
+        include-hidden-files: true
+        path: |
+          dist/*

BUILD.rest

@@ -39,17 +39,13 @@ wxPython
 Version 2.8.12.1 of wxPython__ was the last for the 2 series.
 Together with version 3.0.2, they are called the wxPython Classic.
 
-The current recommended version of wxPython is 4.0.7.post2 and was called wxPhoenix.
-RIDE is not fully compatible with newest wxPython 4.1.
-
-RIDE on Python 2.7 still runs with any version of those Classic or wxPhoenix.
-On Python 3.6+, only wxPhoenix is supported (and in the future we will only
-support those).
+The current recommended version of wxPython is 4.2.3, the project was called wxPhoenix.
 
 **VERSION 1.7.4.2 IS THE LAST RELEASE SUPPORTING PYTHON 2.7 AND WXPYTHON <3.0.3**
 
-**wxPython will be updated to current version 4.0.7.post2**
+**Version 2.0.8.1 was the last release supporting Python 3.6 and 3.7**
 
+<!--
 For testing purposes, users can select which version to use, by creating the
 file ``wx.pth`` containing the directory name of the wxPython to use. That 
 directory must contain the two wxPython directories (moved into)::
@@ -69,6 +65,7 @@ Example::
     # wx-4.0.4
     # wx-4.0.6
     # wx-4.0.7
+-->
 
 
 It is highly recommended, if you want to program with wxPython to download and
@@ -96,6 +93,11 @@ Unit tests are in `utest` directory. They can be executed with::
 
   invoke test
 
+or, to have coverage report:
+
+  invoke test-ci
+
+
 There is also a shell script (requiring customization for your environment).
 It allows to run the test files stopping when errors are found.
 Example::
@@ -169,10 +171,9 @@ Creating distributions
 
       invoke clean
 
-3. Create and validate source distribution in zip format and universal (i.e.
-   Python 2 and 3 compatible) `wheel <http://pythonwheels.com>`_::
+3. Create and validate source distribution and `wheel <http://pythonwheels.com>`_::
 
-      python setup.py sdist --formats zip bdist_wheel --universal
+      python -m build
       ls -l dist
       twine check dist/*
 
@@ -190,7 +191,7 @@ Creating distributions
       pip install --pre --upgrade robotframework-ride
 
 
-* Announce on usergroup, robot homepage, forum, slack, and twitter
+* Announce on usergroup, robot homepage, forum, slack, and LinkedIn
 
 
 Settings migration

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`
 

pyproject.toml

@@ -0,0 +1,100 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "robotframework-ride"
+dynamic = ["version"]
+description = "RIDE :: Robot Framework Test Data Editor"
+license = "Apache-2.0"
+license-files = { paths = ["LICENSE.txt"] }
+requires-python = ">=3.8, <3.15"
+authors = [
+    { name = "Robot Framework Developers", email = "[email protected]" },
+]
+maintainers = [
+  { name = "Hélio Guilherme", email = "[email protected]" },
+]
+keywords = [
+    "robotframework",
+    "testautomation",
+    "testing",
+    "test editor",
+    "IDE",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Software Development :: Testing",
+]
+dependencies = [
+    "psutil",
+    "Pygments",
+    "PyPubSub",
+    "Pywin32; platform_system == 'Windows'",
+    "wxPython",
+]
+
+[project.urls]
+Download = "https://pypi.python.org/pypi/robotframework-ride"
+Homepage = "https://github.com/robotframework/RIDE/"
+
+[tool.uv]
+# python-preference = "only-system"
+
+[tool.hatch.version]
+path = "src/robotide/version.py"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/src",
+]
+[tool.hatch.build.targets.wheel]
+packages = ["src/robotide"]
+
+[project.scripts]
+ride_postinstall = "robotide.postinstall:main"
+
+[project.gui-scripts]
+ride = "robotide:main"
+
+[tool.hatch.envs.test]
+dependencies = [
+    "pytest",
+    "coverage",
+]
+
+[[tool.hatch.envs.test.matrix]]
+python = ["3.13"]
+version = ["2.1.4"]
+
+[tool.poetry]
+name = "robotframework-ride"
+version = "2.1.4"
+description = "RIDE :: Robot Framework Test Data Editor"
+authors = ["Robot Framework Developers <[email protected]>"]
+license = "Apache-2.0 license"
+readme = "README.adoc"
+packages = [{include = "robotide"}]
+
+[tool.poetry.dependencies]
+python = "^3.8"
+wxPython = "^4.1.1"
+pywin32 = { version = "*", markers = "sys_platform == 'win32'" }
+pygments = "*"
+robotframework = "*"
+pypubsub = "*"
+psutil = "*"
+
+[tool.poetry.group.test.dependencies]
+pytest = "*"
+pytest-mock = "*"
+coverage = "*"

requirements-dev.txt

@@ -1,4 +1,5 @@
 setuptools>=70.0.0
+build
 mockito
 invoke
 urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability

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

@@ -12,6 +12,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+from operator import index
 
 import wx
 from wx import Colour
@@ -262,22 +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()
+        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 and popup_value.lower().startswith(p.strip('}])').lower()):
+                idx = initial_value.index(p)
+                initial_value = initial_value[:idx]
+                break
         if self.gherkin_prefix:
-            value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
+            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 = self._popup.get_value() or self.GetValue()
+            value = initial_value + popup_value  # or self.GetValue()
+        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'):
@@ -604,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():