fix(amazonq): Fix cases where content may be incorrectly excluded from workspace. #5482
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ctidd
commented
Mar 19, 2025
Comment on lines
105
to
126
| // Because we traverse from the content root, ensure we continue traverse toward the selection root: | ||
| // (Handles when selection root is inside a content root) | ||
| if (VfsUtil.isAncestor(file, selectionRoot, false)) { | ||
| return true | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This is the actual change in this file. The rest of the change is inlining shouldIncludeInZipFile logic into the VirtualFileVisitor. I started out with a change to expose an enum (i.e. CONTINUE in addition to INCLUDE and EXCLUDE) instead of a boolean, but found it was clearer to inline the logic.
ctidd
force-pushed
the
ctidd/fix-exclude
branch
from
6417c7a to
be08169
Compare
ctidd
force-pushed
the
ctidd/fix-exclude
branch
from
be08169 to
79abd2e
Compare
gandhi-21
approved these changes
Mar 19, 2025
neilk-aws
approved these changes
Mar 19, 2025
rli
approved these changes
Mar 19, 2025
leigaol
pushed a commit
to leigaol/aws-toolkit-jetbrains
that referenced
this pull request
Mar 20, 2025
…m workspace. (aws#5482) **Problem 1:** Incorrectly filtering out directories in `additionalGlobalIgnoreRulesForStrictSources` due to missing null check on file extension. Fixed and added tests. **Problem 2:** Because we start traversal at the content roots, but filter out any content not within the selection root, we were incorrectly stopping traversal when the selection root is nested within any content root. In this case, we were exiting without traversing to find the `selectedRoot`. Fixed and added tests. **Problem 3:** Add support for DevFile (as normally supported, when at workspace root) when workspace root is not a content root. Fixes excluding the DevFile when it's not in a content root.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Types of changes
Description
Problem 1: Incorrectly filtering out directories in
additionalGlobalIgnoreRulesForStrictSourcesdue to missing null check on file extension. Fixed and added tests.Problem 2: Because we start traversal at the content roots, but filter out any content not within the selection root, we were incorrectly stopping traversal when the selection root is nested within any content root. In this case, we were exiting without traversing to find the
selectedRoot. Fixed and added tests.Problem 3: Add support for DevFile (as normally supported, when at workspace root) when workspace root is not a content root. Fixes excluding the DevFile when it's not in a content root.
Checklist
License
I confirm that my contribution is made under the terms of the Apache 2.0 license.