fix(amazonq): update logic for converting gitignore pattern to regex #5360
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
gandhi-21
force-pushed
the
gitignoreChanges
branch
from
219b520 to
8e36b25
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
Fixed
Show fixed
Hide fixed
juanbenj
reviewed
Feb 12, 2025
...t/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt
Show resolved
Hide resolved
...t/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt
Show resolved
Hide resolved
| "file.png/", | ||
| "src/file.png/" | ||
| ) | ||
| val expectedFilesToMatch = listOf(".gitignore/", ".env/", "file.txt/", "build/", "build/output.jar/", "log.txt/", "file.png/", "src/file.png/") |
There was a problem hiding this comment.
NIT: I would move this directly above the assertion -- it took me a bit to understand what this meant in the context of the test
Comment on lines
189
to
191
| for (sampleFileName in sampleFileNames) { | ||
| for (pattern in patterns) { | ||
| if (pattern.matches(sampleFileName)) { | ||
| matchedFiles.add(sampleFileName) | ||
| break | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Optional: You could do something like:
val matchedFiles = samplefileNames.filter { fileName -> patterns.find { pattern -> pattern.matches(fileName)}}There was a problem hiding this comment.
makes sense, updating
...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
Outdated
Show resolved
Hide resolved
gandhi-21
force-pushed
the
gitignoreChanges
branch
2 times, most recently
from
371d0eb to
d860beb
Compare
gandhi-21
force-pushed
the
gitignoreChanges
branch
2 times, most recently
from
b55c947 to
668f385
Compare
juanbenj
approved these changes
Feb 12, 2025
neilk-aws
approved these changes
Feb 12, 2025
gandhi-21
force-pushed
the
gitignoreChanges
branch
from
d2cb0ed to
34ded4d
Compare
vikshe
reviewed
Feb 12, 2025
| "mybuild/", | ||
| "build.json/", | ||
| "log.txt/", | ||
| "file.txt.json/", |
There was a problem hiding this comment.
why each file name ends with '/' ?
There was a problem hiding this comment.
there's a trailing / added when matching files as per the comment
https://github.com/aws/aws-toolkit-jetbrains/blob/main/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt#L285
rli
approved these changes
Feb 17, 2025
gandhi-21
force-pushed
the
gitignoreChanges
branch
2 times, most recently
from
fa5f45c to
9350f89
Compare
gandhi-21
force-pushed
the
gitignoreChanges
branch
from
9350f89 to
fb597cc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Updating .gitignore pattern to regex conversion to factor for following edge cases:
.*should be matching only files starting with.now, instead of all files previouslyAs part of the changes, added a unit test to verify the correct regex pattern is being created and files are being matched.
Existing tests which check the file zipping logic are passing as well so no regression should be expected.
Types of changes
Description
The current implementation to convert
.gitignorepatterns into regex is not following gitignore patterns and resulting in the below issues.*is converted into\\..*/.*which results in all files being selected instead of the intention to only select files that start with a.. This is a special case where adding^in the front makes sure only files starting with.are ignored.Changes
.*caseChecklist
License
I confirm that my contribution is made under the terms of the Apache 2.0 license.