Fix portmaster completions when there are no matches #3950
Closed
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
Don't spew warnings when there are no matches. Also, use the string builtin instead of calling sed. Fixes fish-shell#3949
krader1961
reviewed
Apr 11, 2017
| @@ -48,8 +48,7 @@ complete -c portmaster -l version --description 'display the version number El E | |||
| # Grab items from the ports directory, max depth 2 | |||
| complete -c portmaster -f --description 'Ports Directory' -a " | |||
| ( | |||
| ls -d /usr/ports/(commandline -ct)*/ \ | |||
| | sed -E -e 's#/usr/ports/##' -e 's#/+#/#' -e 's#([^/]+/[^/]+).*#\1#' | |||
| string match -r '(?<=/usr/ports/)[^/]*(?:/[^/]*)?' (__fish_complete_directories /usr/ports/(commandline -ct)) | |||
There was a problem hiding this comment.
Nice use of PCRE features. Note that the (__fish_complete_directories /usr/ports/(commandline -ct)) does expand past two levels. Your PCRE ensures that only the first two levels are emitted by the completion. It's probably not worthwhile optimizing this any further. I just wanted to make sure you were aware that levels three and higher are expanded by __fish_complete_directories before being trimmed to two levels by the string match.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Don't spew warnings when there are no matches. Also, use the string
builtin instead of calling sed.
Fixes #3949
TODOs: