From 555b0d235bd29ace645c263ef2fdb744717f8885 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 1 Jun 2024 14:13:24 +0900 Subject: [PATCH] Ignore --height option if it's not supported on the platform This is to make shell integration work out of the box on Git bash. eval "$(fzf --bash)" vim # would print '--height option is currently not supported on this platform' --- src/options.go | 9 +++++---- src/winpty_windows.go | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/options.go b/src/options.go index 18e4040..78b8dd0 100644 --- a/src/options.go +++ b/src/options.go @@ -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 { runes := []rune(*opts.Scrollbar) if len(runes) > 2 { @@ -2841,6 +2837,11 @@ func postProcessOptions(opts *Options) error { 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 { return errors.New("failed to start pprof profiles: " + err.Error()) } diff --git a/src/winpty_windows.go b/src/winpty_windows.go index a9e56bb..29cd0f9 100644 --- a/src/winpty_windows.go +++ b/src/winpty_windows.go @@ -24,12 +24,11 @@ func needWinpty(opts *Options) bool { See: https://github.com/junegunn/fzf/issues/3809 "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. */ if strings.Contains(os.Getenv("MSYS"), "enable_pcon") { - opts.Height = heightSpec{} return false }