Shared extractor: support file path globs #13969
Merged
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
aibaars
reviewed
Aug 23, 2023
| // Construct a single globset containing all language globs, | ||
| // and a mapping from glob index to language index. | ||
| let (globset, glob_language_mapping) = { | ||
| let mut builder = GlobSetBuilder::new(); |
There was a problem hiding this comment.
Let's set the literal_separator feature, so path separators do not match the * and ? wildcards.
Suggested change
| let mut builder = GlobSetBuilder::new(); | |
| let mut builder = GlobSetBuilder::new().literal_separator(true); |
There was a problem hiding this comment.
I remember now why I didn't do this:
One surprising aspect of this change is that the globs match against the
whole path, rather than just the file name.
If we prevent * from matching file separators, then *.txt will match foo.txt but not bar/foo.txt.
There was a problem hiding this comment.
Sure, but if you don't want that then you should match the globs against the whole paths. Instead of globset.matches(&path); we could do something like globset.matches(&path.filename());
Alternatively, users could add **/ prefixes to their globs.
hmac
force-pushed
the
shared-extractor-globs
branch
from
2409b71 to
a9115c5
Compare
Replace the `file_extensions` field with `file_globs`, which supports UNIX style glob patterns powered by the `globset` crate. This allows files with no extension (e.g. Dockerfiles) to be extracted, by specifying a glob such as `*Dockerfile`. One surprising aspect of this change is that the globs match against the whole path, rather than just the file name. This is a breaking change.
hmac
force-pushed
the
shared-extractor-globs
branch
from
a9115c5 to
60f2506
Compare
hmac
force-pushed
the
shared-extractor-globs
branch
from
5645322 to
3680613
Compare
aibaars
approved these changes
Aug 23, 2023
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.
Update the tree-sitter extractor to support file globs. This replaces the existing
file_extensionsfield with afile_globsfield, which supports UNIX style glob patterns powered by theglobsetcrate.This allows files with no extension (e.g. Dockerfiles) to be extracted
by specifying a glob such as
*Dockerfile.One surprising aspect of this change is that the globs match against the
whole path, rather than just the file name. I'm not sure if this is an issue we should work around, or if it's OK.
@aibaars I'd be interested in your thoughts on this.
Fixes #13964