Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-21 20:35:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix error message on invalid --tmux option

Browse Source 
fzf --tmux foobar
  # not a valid integer: foobar
  # ->
  # invalid tmux option: foobar (expected: [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]])
This commit is contained in:
Junegunn Choi 2024-05-31 13:38:39 +09:00
parent 2b6d600879
commit 7aa88aa115
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/options.go
View File

@ -290,8 +290,9 @@ func parseTmuxOptions(arg string) (*tmuxOptions, error) {
var err error
opts := defaultTmuxOptions()
tokens := splitRegexp.Split(arg, -1)
errorToReturn := errors.New("invalid tmux option: " + arg + " (expected: [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]])")
if len(tokens) == 0 || len(tokens) > 3 {
return nil, errors.New("invalid tmux option: " + arg + " (expected: [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]])")
return nil, errorToReturn
}
// Defaults to 'center'
@ -317,7 +318,7 @@ func parseTmuxOptions(arg string) (*tmuxOptions, error) {
var size1 sizeSpec
if len(tokens) > 1 {
if size1, err = parseSize(tokens[1], 100, "size"); err != nil {
return nil, err
return nil, errorToReturn
}
}
@ -325,7 +326,7 @@ func parseTmuxOptions(arg string) (*tmuxOptions, error) {
var size2 sizeSpec
if len(tokens) == 3 {
if size2, err = parseSize(tokens[2], 100, "size"); err != nil {
return nil, err
return nil, errorToReturn
}
opts.width = size1
opts.height = size2