[Finder] Adjust regex to correctly match comments in gitignore contents #33340
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
OskarStark
approved these changes
Aug 26, 2019
maxhelias
approved these changes
Aug 27, 2019
|
Ready to merge or is more review needed? |
fabpot
requested changes
Sep 16, 2019
| [ | ||
| ' | ||
| /app/cache/ | ||
| \#EscapedComment |
There was a problem hiding this comment.
What about using a real file name to check that it will be in the list (#file.txt like in a test above)?
There was a problem hiding this comment.
That'd indeed be more useful, I'll change it.
fabpot
approved these changes
Sep 16, 2019
33b2695 to
e56fc7c
Compare
|
Thank you @Jeroeny. |
fabpot
added a commit
that referenced
this pull request
Sep 16, 2019
…nore contents (Jeroeny) This PR was squashed before being merged into the 4.3 branch (closes #33340). Discussion ---------- [Finder] Adjust regex to correctly match comments in gitignore contents | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32985 | License | MIT Description from issue: When using `ignoreVCSIgnored` as argument with the Symfony Finder, it will construct a regex equivalent of the gitignore pattern. However it seems that when a comment line (prefixed with `#`) is present in the `.gitignore`, the regex used to remove comment lines matches every line and thus returns `$gitignoreFileContent` as empty. Commits ------- e56fc7c [Finder] Adjust regex to correctly match comments in gitignore contents
Merged
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.
Description from issue:
When using
ignoreVCSIgnoredas argument with the Symfony Finder, it will construct a regex equivalent of the gitignore pattern. However it seems that when a comment line (prefixed with#) is present in the.gitignore, the regex used to remove comment lines matches every line and thus returns$gitignoreFileContentas empty.