diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2021-01-03 00:00:40 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2021-01-03 00:15:00 +0900 |
| commit | d779ff7e6dcf068fbcf743bed45127c3b857ec92 (patch) | |
| tree | e50d90a35c8a59841eaad89af9c5718ab2663237 /src/options.go | |
| parent | fd8858f8c93e38d50f00cd21430e21d89e2f9399 (diff) | |
| download | fzf-d779ff7e6dcf068fbcf743bed45127c3b857ec92.tar.gz | |
Make search toggleable
- `--phony` renamed to `--disabled` for consistency
- `--no-phony` is now `--enabled`
- Added `enable-search`, `disable-search`, and `toggle-search` actions
for `--bind`
- Added `--color` options: `query` and `disabled`
Close #2303
Diffstat (limited to 'src/options.go')
| -rw-r--r-- | src/options.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/options.go b/src/options.go index 691934ed..12c09556 100644 --- a/src/options.go +++ b/src/options.go @@ -33,7 +33,7 @@ const usage = `usage: fzf [options] -d, --delimiter=STR Field delimiter regex (default: AWK-style) +s, --no-sort Do not sort the result --tac Reverse the order of the input - --phony Do not perform search + --disabled Do not perform search --tiebreak=CRI[,..] Comma-separated list of sort criteria to apply when the scores are tied [length|begin|end|index] (default: length) @@ -682,8 +682,10 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme { } } switch components[0] { - case "input": + case "query", "input": mergeAttr(&theme.Input) + case "disabled": + mergeAttr(&theme.Disabled) case "fg": mergeAttr(&theme.Fg) case "bg": @@ -875,6 +877,8 @@ func parseKeymap(keymap map[tui.Event][]action, str string) { appendAction(actToggleOut) case "toggle-all": appendAction(actToggleAll) + case "toggle-search": + appendAction(actToggleSearch) case "select-all": appendAction(actSelectAll) case "deselect-all": @@ -923,6 +927,10 @@ func parseKeymap(keymap map[tui.Event][]action, str string) { appendAction(actPreviewHalfPageUp) case "preview-half-page-down": appendAction(actPreviewHalfPageDown) + case "enable-search": + appendAction(actEnableSearch) + case "disable-search": + appendAction(actDisableSearch) default: t := isExecuteAction(specLower) if t == actIgnore { @@ -1199,9 +1207,9 @@ func parseOptions(opts *Options, allArgs []string) { } case "--no-expect": opts.Expect = make(map[tui.Event]string) - case "--no-phony": + case "--enabled", "--no-phony": opts.Phony = false - case "--phony": + case "--disabled", "--phony": opts.Phony = true case "--tiebreak": opts.Criteria = parseTiebreak(nextString(allArgs, &i, "sort criterion required")) |
