Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed validation of multiple arguments with default values #2874

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ The color of the caret is the same as `setting` and will be adjusted for better

=== Fixed

- Fixed validation of multiple arguments with default values in Grid Editor.
- Fixed on Text Editor when Saving the selection of tests to run in Test Suites (Tree) is cleared.
- Fixed wrong item selection, like Test Suite, when doing right-click actions in Project Explorer.
- Fixed delete variable from Test Suite settings remaining in Project Explorer.
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <= python <= 3.12) Install current development version (**2.1dev74**) with:
(3.8 <= python <= 3.12) Install current development version (**2.1dev75**) with:

`pip install -U https://github.com/robotframework/RIDE/archive/master.zip`

Expand Down
2 changes: 2 additions & 0 deletions src/robotide/application/CHANGELOG.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
</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">
Allow to do auto-suggestions of keywords in Text Editor without a shortcut, if you want to enable or disable this feature you can config in <code class="literal">Tools -&gt; Preferences -&gt; Text Editor -&gt; Enable auto suggestions</code>.
</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed"></a>1.3. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
Fixed validation of multiple arguments with default values in Grid Editor.
</li><li class="listitem">
Fixed on Text Editor when Saving the selection of tests to run in Test Suites (Tree) is cleared.
</li><li class="listitem">
Fixed wrong item selection, like Test Suite, when doing right-click actions in Project Explorer.
Expand Down
1 change: 1 addition & 0 deletions src/robotide/application/releasenotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ def set_content(self, html_win, content):
</ul>
<p><strong>New Features and Fixes Highlights</strong></p>
<ul class="simple">
<li>Fixed validation of multiple arguments with default values in Grid Editor.</li>
<li>Added color to Test Runner Console Log final output, report and log since RF v7.1rc1.</li>
<li>Fixed on Text Editor when Saving the selection of tests to run in Test Suites (Tree) is cleared.</li>
<li>Added Korean language support for UI, experimental.</li>
Expand Down
10 changes: 7 additions & 3 deletions src/robotide/validators/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,14 @@ def _validate(self, args_str):

@staticmethod
def _get_type(arg):
if robotapi.is_scalar_var(arg):
return ArgumentTypes.SCALAR
elif robotapi.is_scalar_var(arg.split("=")[0]):
if '=' in arg and len(arg.split("=")) > 1:
default_arg = arg.split("=")[0]
else:
default_arg = False
if robotapi.is_scalar_var(default_arg):
return ArgumentTypes.DEFAULT
elif robotapi.is_scalar_var(arg):
return ArgumentTypes.SCALAR
elif arg == '@{}':
return ArgumentTypes.NAMED
elif robotapi.is_list_var(arg):
Expand Down
2 changes: 1 addition & 1 deletion src/robotide/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Automatically generated by `tasks.py`.

VERSION = 'v2.1dev74'
VERSION = 'v2.1dev75'
1 change: 1 addition & 0 deletions utest/validators/test_arguments_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def test_valid_arguments_validation(self):
"${arg}|${arg2}",
"${arg}=",
"${arg}=def val",
"${job_id}=val | ${json}=${EMPTY}",
"${a} | ${b}=d | ${c}=\\| | ${d}=",
"@{list}",
"${a} | ${b} | @{f}",
Expand Down
Loading