From 865144850da99307fa3345f78de792ddbb1bd260 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Fri, 9 Oct 2020 21:56:16 +0900 Subject: Add nowrap, nocycle, nohidden for --preview-window Close #2203 --- src/options.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/options.go') diff --git a/src/options.go b/src/options.go index c7354b35..51e5001c 100644 --- a/src/options.go +++ b/src/options.go @@ -80,9 +80,10 @@ const usage = `usage: fzf [options] Preview --preview=COMMAND Command to preview highlighted line ({}) --preview-window=OPT Preview window layout (default: right:50%) - [up|down|left|right][:SIZE[%]][:wrap][:cycle][:hidden] - [:+SCROLL[-OFFSET]] + [up|down|left|right][:SIZE[%]] + [:[no]wrap][:[no]cycle][:[no]hidden] [:rounded|sharp|noborder] + [:+SCROLL[-OFFSET]] Scripting -q, --query=STR Start the finder with the given query @@ -994,10 +995,6 @@ 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]*)?$") @@ -1006,10 +1003,16 @@ func parsePreviewWindow(opts *previewOpts, input string) { case "": case "hidden": opts.hidden = true + case "nohidden": + opts.hidden = false case "wrap": opts.wrap = true + case "nowrap": + opts.wrap = false case "cycle": opts.cycle = true + case "nocycle": + opts.cycle = false case "up", "top": opts.position = posUp case "down", "bottom": -- cgit v1.2.3