[Search directory] Prevent duplicate / when fd version >= 8.4.0 #241
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
|
No idea why the tests failed, but as always I don't find tests interesting 😬 |
PatrickF1
approved these changes
May 30, 2022
functions/_fzf_search_directory.fish
Outdated
| @@ -31,7 +31,7 @@ function _fzf_search_directory --description "Search the current directory. Repl | |||
| # Then, the user only needs to hit Enter once more to cd into that directory. | |||
| if test (count $file_paths_selected) = 1 | |||
| set commandline_tokens (commandline --tokenize) | |||
| if test "$commandline_tokens" = "$token" -a -d "$file_paths_selected" | |||
| if test "$commandline_tokens" = "$token" -a -d "$file_paths_selected" -a (fd --version | string replace --regex --all '[^\d]' '') -lt 840 | |||
There was a problem hiding this comment.
Can you put the fd version check on its own line, line 33, and make it a boolean that you test in the if? more readable
There was a problem hiding this comment.
A line break may be simper
|
oh looks like you'll need to update the test too |
|
Thanks @kidonng ! |
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.
fd 8.4.0 just released with this (long-awaited?) change:
This is different from how it is handled in fzf.fish, where directories are only appended a slash under strict conditions, so strict it may look like a bug. I'm saying this because I kinda think fzf.fish should have handled it like fd from the beginning.
Now onto the issue. Most programs treat duplicate slashes as one and work as intended, but it certainly does not look good. There are several possible solutions:
Not sure about how to revise the README, maybe just leave it as is, the tip is useful nonetheless. Or maybe drop the "and the only path selected" part.