Skip to content

Commit 5f4e1c8

Browse files
Fix error color indication in private keywords on files with ##__ prefixes
1 parent 6658a1b commit 5f4e1c8

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Likewise, the current version of wxPython, is 4.2.3, but RIDE is known to work w
4141

4242
`pip install -U robotframework-ride`
4343

44-
(3.8 <= python <= 3.14) Install current development version (**2.2dev34**) with:
44+
(3.8 <= python <= 3.14) Install current development version (**2.2dev36**) with:
4545

4646
`pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
4747

src/robotide/application/releasenotes.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,11 @@ def set_content(self, html_win, content):
161161
<li>🐞 - Problems with COPY/PASTE in Text Editor have been reported when using wxPython 4.2.0, but not with
162162
version 4.2.1, 4.2.2 and 4.2.3, which we now <em>recommend</em>.</li>
163163
-->
164-
<li>🐞 - Rename Keywords, Find Usages/Find where used are not finding all occurrences. Please, double-check findings and changes.</li>
164+
<li>🐞 - Rename Keywords, Find Usages/Find where used are not finding all occurrences. Please, double-check findings
165+
and changes.</li>
165166
<li>🐞 - Some argument types detection (and colorization) is not correct in Grid Editor.</li>
167+
<li>🐞 - In Grid Editor, private keywords defined in test suites with <b>Name</b> setting, will show with error color
168+
even if used correctly in another local keyword.</li>
166169
<li>🐞 - RIDE <strong>DOES NOT KEEP</strong> Test Suites formatting or structure, causing differences in files when used
167170
on other IDE or Editors. The option to not reformat the file is not working.</li>
168171
<li>🐞 - In Grid Editor, when showing settings, scrolling down with mouse or using down is not working. You can change
@@ -256,7 +259,7 @@ def set_content(self, html_win, content):
256259
<pre class="literal-block">python -m robotide.postinstall -install</pre>
257260
<p>or</p>
258261
<pre class="literal-block">ride_postinstall.py -install</pre>
259-
<p>RIDE {VERSION} was released on 20/July/2025.</p>
262+
<p>RIDE {VERSION} was released on 21/July/2025.</p>
260263
<!-- <br/>
261264
<h3>May The Fourth Be With You!</h3>
262265
<h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>

src/robotide/editor/gridcolorizer.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15+
import re
1516
import wx
1617

1718
from ..controller.cellinfo import CellType, ContentType
@@ -24,6 +25,7 @@
2425
# wxFONTWEIGHT_NORMAL = 90
2526
# DEBUG using wx.FONTWEIGHT_BOLD, wx.FONTWEIGHT_NORMAL
2627

28+
prefix=re.compile(r'^\d+_{2,}')
2729

2830
class Colorizer(object):
2931

@@ -65,13 +67,13 @@ def _colorize_cell(self, row, col, selection_content):
6567
source = self._controller.display_name
6668
parent = self._controller.parent
6769
parent_name = self._controller.datafile_controller.name
68-
cell_source = (cell_info.source.split('.')[0]).title()
70+
cell_source = prefix.sub('', cell_info.source.split('.')[0], 1).title()
6971
private = cell_info.private
7072
current_section = 'keywords' if isinstance(self._controller, UserKeywordController) else 'tests'
7173
# print(f"DEBUG: gridcolorizer.py Colorizer _colorize_cell USER KEYWORD source={source} "
7274
# f"CELL Source=={cell_source} parent={parent} parent_name={parent_name}"
7375
# f"\n Same File? {cell_source==parent_name} PRIVATE={private} "
74-
# f" section={self._grid._parent.section} current_section={current_section}")
76+
# f" source={self._controller.datafile_controller.datafile.source} current_section={current_section}")
7577
if private:
7678
if current_section == 'tests' or (current_section == 'keywords'
7779
and cell_source != parent_name):

src/robotide/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
#
1616
# Automatically generated by `tasks.py`.
1717

18-
VERSION = 'v2.2dev35'
18+
VERSION = 'v2.2dev36'

0 commit comments

Comments
 (0)