Archives/fzf
2
0
Fork 0
mirror of https://github.com/junegunn/fzf synced 2024-11-02 21:40:34 +00:00
Code Issues Projects Releases Wiki Activity

Ignore --height option if it's not supported on the platform

Browse Source 
This is to make shell integration work out of the box on Git bash.

  eval "$(fzf --bash)"
  vim <CTRL-T>
    # would print '--height option is currently not supported on this platform'
This commit is contained in:
Junegunn Choi 2024-06-01 14:13:24 +09:00
parent 564daf9a7d
commit 555b0d235b
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/options.go
View File

@ -2685,10 +2685,6 @@ func validateOptions(opts *Options) error {
} }
} }
if !tui.IsLightRendererSupported() && opts.Height.size > 0 {
return errors.New("--height option is currently not supported on this platform")
}
if opts.Scrollbar != nil { if opts.Scrollbar != nil {
runes := []rune(*opts.Scrollbar) runes := []rune(*opts.Scrollbar)
if len(runes) > 2 { if len(runes) > 2 {
@ -2841,6 +2837,11 @@ func postProcessOptions(opts *Options) error {
theme.Spinner = boldify(theme.Spinner) theme.Spinner = boldify(theme.Spinner)
} }
// If --height option is not supported on the platform, just ignore it
if !tui.IsLightRendererSupported() && opts.Height.size > 0 {
opts.Height = heightSpec{}
}
if err := opts.initProfiling(); err != nil { if err := opts.initProfiling(); err != nil {
return errors.New("failed to start pprof profiles: " + err.Error()) return errors.New("failed to start pprof profiles: " + err.Error())
} }

3
src/winpty_windows.go
View File

@ -24,12 +24,11 @@ func needWinpty(opts *Options) bool {
See: https://github.com/junegunn/fzf/issues/3809 See: https://github.com/junegunn/fzf/issues/3809
"MSYS=enable_pcon" allows fzf to run properly on mintty 3.4.5 or later, "MSYS=enable_pcon" allows fzf to run properly on mintty 3.4.5 or later,
however `--height` option still doesn't work, so let's just disable it. however `--height` option still doesn't work, and it's going to be ignored.
We're not going to worry too much about restoring the original value. We're not going to worry too much about restoring the original value.
*/ */
if strings.Contains(os.Getenv("MSYS"), "enable_pcon") { if strings.Contains(os.Getenv("MSYS"), "enable_pcon") {
opts.Height = heightSpec{}
return false return false
} }