Include excluded files #2593
Merged
Include excluded files #2593
Conversation
This file contains 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
mamazu
force-pushed
the
phpactor-2485-include-exclude
branch
from
ad66886
to
be82766
Compare
mamazu
force-pushed
the
phpactor-2485-include-exclude
branch
from
5996291
to
abff473
Compare
mamazu
commented
Mar 9, 2024
dantleech
reviewed
Mar 14, 2024
| if($compare !== 0) { | ||
| return $compare; | ||
| } | ||
| } |
There was a problem hiding this comment.
can you add a commenta about what this is doing? i.e. if the segments are the same length then... ??
There was a problem hiding this comment.
What exactly should I comment here. If they are the same then their order doesn't matter.
There was a problem hiding this comment.
explaining what the different branches mean. It's not obvious what ==='** and ==='*' mean and why we return. what happens with baz* or *baz or with */baz/**/boo*?
There was a problem hiding this comment.
Oh yeah wildcards within a path aren't handled. That's a valid point.
dantleech
reviewed
Mar 14, 2024
| $partsB = explode(DIRECTORY_SEPARATOR, $b); | ||
| $countDiff = count($partsA) <=> count($partsB); | ||
| if ($countDiff !== 0) { | ||
| // Longer paths should come first |
There was a problem hiding this comment.
paths with more segments.
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.
Fixes #2485
The include and exclude logic now allows for included paths inside excluded paths.
Also the tests for the file provider now also check that it returns the correct files and not just the count.
How this worked before
Call
includesto filter the list of files to include and then callexcludeto remove files from that list that are excluded.How it works now
Build a map of paths and if they are included or not and tries to match all files against that map to see if they should be included or not.