diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2020-10-09 19:53:51 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2020-10-09 19:53:51 +0900 |
| commit | d9752a4c21ba8a98e26dcf2199f22581d3946dfa (patch) | |
| tree | fc37e3e8e5cfe82b0f7e248966f91e51e7e3e335 /src | |
| parent | dba14d26303297322dc4426d38ebfbf1d76a6011 (diff) | |
| download | fzf-d9752a4c21ba8a98e26dcf2199f22581d3946dfa.tar.gz | |
Reset preview window flags that are not style-related
Fix #2203
Diffstat (limited to 'src')
| -rw-r--r-- | src/options.go | 4 | ||||
| -rw-r--r-- | src/options_test.go | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/options.go b/src/options.go index 35220bae..c7354b35 100644 --- a/src/options.go +++ b/src/options.go @@ -994,6 +994,10 @@ func parseInfoStyle(str string) infoStyle { } func parsePreviewWindow(opts *previewOpts, input string) { + // We should reset flags that are not style-related. + opts.hidden = false + opts.scroll = "" + tokens := strings.Split(input, ":") sizeRegex := regexp.MustCompile("^[0-9]+%?$") offsetRegex := regexp.MustCompile("^\\+([0-9]+|{-?[0-9]+})(-[0-9]+|-/[1-9][0-9]*)?$") diff --git a/src/options_test.go b/src/options_test.go index 457c6c15..38873738 100644 --- a/src/options_test.go +++ b/src/options_test.go @@ -387,21 +387,23 @@ func TestPreviewOpts(t *testing.T) { opts.Preview.size.size == 50) { t.Error() } - opts = optsFor("--preview", "cat {}", "--preview-window=left:15:hidden:wrap") + opts = optsFor("--preview", "cat {}", "--preview-window=left:15:hidden:wrap:+{1}-/2") if !(opts.Preview.command == "cat {}" && opts.Preview.hidden == true && opts.Preview.wrap == true && opts.Preview.position == posLeft && + opts.Preview.scroll == "{1}-/2" && opts.Preview.size.percent == false && opts.Preview.size.size == 15) { t.Error(opts.Preview) } - opts = optsFor("--preview-window=up:15:wrap:hidden", "--preview-window=down", "--preview-window=cycle") + opts = optsFor("--preview-window=up:15:wrap:hidden:+{1}-/2", "--preview-window=down", "--preview-window=cycle") if !(opts.Preview.command == "" && - opts.Preview.hidden == true && + opts.Preview.hidden == false && opts.Preview.wrap == true && opts.Preview.cycle == true && opts.Preview.position == posDown && + opts.Preview.scroll == "" && opts.Preview.size.percent == false && opts.Preview.size.size == 15) { t.Error(opts.Preview.size.size) |