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

Fix disappearing of resource files from Project tree #2642

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 @@ -18,6 +18,7 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni

=== Fixed

- Fixed resource files dissapearing from Project tree on Windows
- Fixed missing indication of link for User Keyword, when pressing ``Ctrl`` in Grid Editor
- Fixed exception when finding GREY color for excluded files and directories in Project Tree
- Colorization of Grid Editor cells after the continuation marker ``...`` and correct parsing of those lines
Expand Down
5 changes: 4 additions & 1 deletion src/robotide/application/CHANGELOG.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
</li><li class="listitem">
Added support for JSON variables, by using the installed Robot Framework import method
</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_fixed"></a>1.2. Fixed</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem">Fixed missing indication of link for User Keyword, when pressing ``Ctrl`` in Grid Editor</li><li class="listitem">
<li class="listitem">Fixed resource files dissapearing from Project tree on Windows
</li><li class="listitem">
Fixed missing indication of link for User Keyword, when pressing ``Ctrl`` in Grid Editor
</li><li class="listitem">
Fixed exception when finding GREY color for excluded files and directories in Project Tree
</li><li class="listitem">
Colorization of Grid Editor cells after the continuation marker ``…`` and correct parsing of those lines
Expand Down
3 changes: 2 additions & 1 deletion src/robotide/application/releasenotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ def set_content(self, html_win, content):
</ul>
<p><strong>New Features and Fixes Highlights</strong></p>
<ul class="simple">
<li>Fixed resource files dissapearing from Project tree on Windows</li>
<li>Fixed missing indication of link for User Keyword, when pressing <b>Ctrl</b> in Grid Editor</li>
<li>Added content help pop-up on Text Editor by pressing <b>Ctrl</b> for text at cursor position or selected autocomplete list item</li>
<li>Added Exclude option in context nenu for Test files, previously was only possible for Test Suites folders</li>
Expand Down Expand Up @@ -238,6 +239,6 @@ def set_content(self, html_win, content):
<pre class="literal-block">
python -m robotide.postinstall -install
</pre>
<p>RIDE {VERSION} was released on 20/Sep/2023.</p>
<p>RIDE {VERSION} was released on 23/Sep/2023.</p>
</div>
"""
5 changes: 5 additions & 0 deletions src/robotide/ui/treeplugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,12 @@ def _create_node_with_handler(self, parent_node, controller, index=None):
if controller.display_name.startswith("#"): # If it is a comment don't create
return None

# DEBUG: Why do we need this? This block caused resources to disappear from tree
"""
if IS_WINDOWS and isinstance(controller, ResourceFileController):
resourcefile = self._normalize(controller.filename)
# print(f"DEBUG: Tree _create_node_with_handler removed condition on WINDOWS for Resources file={resourcefile}")

pname = parent_node.GetText()
self._resources.append((pname, resourcefile))
if IS_WINDOWS:
Expand All @@ -545,6 +549,7 @@ def _create_node_with_handler(self, parent_node, controller, index=None):
count += 1
if count > 3:
return None
"""
handler_class = action_handler_class(controller)
with_checkbox = (handler_class == TestCaseHandler and self._checkboxes_for_tests)
node = self._create_node(parent_node, controller.display_name, self._images[controller],
Expand Down
2 changes: 1 addition & 1 deletion src/robotide/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.
#
# Automatically generated by `tasks.py`.
VERSION = 'v2.0.8dev13'
VERSION = 'v2.0.8dev14'