Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support PathFlag.TakesFile in fish completion #1198

Merged
merged 5 commits into from Oct 31, 2020
Merged

Support PathFlag.TakesFile in fish completion #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bb54ac
fish.go: support PathFlag.TakesFile [#1156]
ErinCall Jun 23, 2020
0d11bd5
Merge remote-tracking branch 'origin/master' into paths-take-files
ErinCall Oct 13, 2020
fcce511
Refactor fishAddFileFlag for better flexibility [#1156]
ErinCall Oct 13, 2020
c3263d4
Merge branch 'master' into paths-take-files
ErinCall Oct 22, 2020
5c8d915
Revert "Refactor fishAddFileFlag for better flexibility [#1156]"
ErinCall Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions fish.go
View file
Open in desktop
Expand Up @@ -171,6 +171,10 @@ func fishAddFileFlag(flag Flag, completion *strings.Builder) {
if f.TakesFile {
return
}
case *PathFlag:
if f.TakesFile {
return
}
}
completion.WriteString(" -f")
}
Expand Down
4 changes: 4 additions & 0 deletions fish_test.go
View file
Open in desktop
Expand Up @@ -7,6 +7,10 @@ import (
func TestFishCompletion(t *testing.T) {
// Given
app := testApp()
app.Flags = append(app.Flags, &PathFlag{
Name: "logfile",
TakesFile: true,
})

// When
res, err := app.ToFishCompletion()
Expand Down
1 change: 1 addition & 0 deletions testdata/expected-fish-full.fish
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ end
complete -c greet -n '__fish_greet_no_subcommand' -l socket -s s -r -d 'some \'usage\' text'
complete -c greet -n '__fish_greet_no_subcommand' -f -l flag -s fl -s f -r
complete -c greet -n '__fish_greet_no_subcommand' -f -l another-flag -s b -d 'another usage text'
complete -c greet -n '__fish_greet_no_subcommand' -l logfile -r
complete -c greet -n '__fish_greet_no_subcommand' -f -l help -s h -d 'show help'
complete -c greet -n '__fish_greet_no_subcommand' -f -l version -s v -d 'print the version'
complete -c greet -n '__fish_seen_subcommand_from config c' -f -l help -s h -d 'show help'
Expand Down