Always expand indexables' full paths #1977
Merged
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
st0012
added
the
server
vinistock
approved these changes
Apr 25, 2024
| @@ -56,6 +56,7 @@ def indexables | |||
| load_path_entry = T.let(nil, T.nilable(String)) | |||
|
|
|||
| Dir.glob(pattern, File::FNM_PATHNAME | File::FNM_EXTGLOB).map! do |path| | |||
| path = File.expand_path(path) | |||
There was a problem hiding this comment.
Expand path doesn't do anything if the path is already absolute, right? Trying to confirm that we'll continue supporting glob patterns based on absolute paths (e.g.: /Users/username/somewhere/**/*.rb)
There was a problem hiding this comment.
No it doesn't do anything in that case:
irb(main):005> File.expand_path("lib")
=> "/Users/hung-wulo/src/github.com/ruby/irb/lib"
irb(main):006> File.join(Dir.pwd, "lib")
=> "/Users/hung-wulo/src/github.com/ruby/irb/lib"
irb(main):007> File.expand_path(File.join(Dir.pwd, "lib"))
=> "/Users/hung-wulo/src/github.com/ruby/irb/lib"
andyw8
approved these changes
Apr 26, 2024
Depends on the `included_pattern`'s value, `Dir.glob` may return relative paths as its default base is the current working directory. For example, if the `included_pattern` is `**/*.rb`, the `Dir.glob` will return relative paths like `lib/foo.rb` instead of the full path like `/path/to/project/lib/foo.rb`. This commit ensures that the full paths are always expanded by using `File.expand_path` on the paths returned by `Dir.glob`. Fixes #1971
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.
Motivation
Depends on the
included_pattern's value,Dir.globmay return relative paths as its default base is the current working directory. For example, if theincluded_patternis**/*.rb, theDir.globwill return relative paths likelib/foo.rbinstead of the full path like/path/to/project/lib/foo.rb.Fixes #1971
Implementation
This commit ensures that the full paths are always expanded by using
File.expand_pathon the paths returned byDir.glob.Automated Tests
Manual Tests