From bba0f3b1e0eb202cfb6b42d562bb40acc50b1e3c Mon Sep 17 00:00:00 2001 From: Maas Lalani Date: Wed, 3 Aug 2022 12:28:02 -0400 Subject: [PATCH] refactor: remove unneeded set:"name=" --- choose/options.go | 6 +++--- confirm/command.go | 7 +++++++ filter/options.go | 6 +++--- gum.go | 6 +++--- input/options.go | 4 ++-- spin/options.go | 8 ++++---- write/options.go | 16 ++++++++-------- 7 files changed, 30 insertions(+), 23 deletions(-) diff --git a/choose/options.go b/choose/options.go index 8359e91..2cfed14 100644 --- a/choose/options.go +++ b/choose/options.go @@ -14,7 +14,7 @@ type Options struct { CursorPrefix string `help:"Prefix to show on the cursor item (hidden if limit is 1)" default:"[•] "` SelectedPrefix string `help:"Prefix to show on selected items (hidden if limit is 1)" default:"[✕] "` UnselectedPrefix string `help:"Prefix to show on selected items (hidden if limit is 1)" default:"[ ] "` - CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212" set:"name=indicator"` - ItemStyle style.Styles `embed:"" prefix:"item." hidden:"" set:"defaultForeground=255" set:"name=item"` - SelectedItemStyle style.Styles `embed:"" prefix:"selected." set:"defaultForeground=212" set:"name=selected item"` + CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212"` + ItemStyle style.Styles `embed:"" prefix:"item." hidden:""` + SelectedItemStyle style.Styles `embed:"" prefix:"selected." set:"defaultForeground=212"` } diff --git a/confirm/command.go b/confirm/command.go index 2bd1ea4..231d1ac 100644 --- a/confirm/command.go +++ b/confirm/command.go @@ -3,7 +3,9 @@ package confirm import ( "os" + "github.com/alecthomas/kong" tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/gum/style" ) // Run provides a shell script interface for prompting a user to confirm an @@ -31,3 +33,8 @@ func (o Options) Run() error { return nil } + +// BeforeReset hook. Used to unclutter style flags. +func (o Options) BeforeReset(ctx *kong.Context) error { + return style.HideFlags(ctx) +} diff --git a/filter/options.go b/filter/options.go index e11a0b1..5b8bd02 100644 --- a/filter/options.go +++ b/filter/options.go @@ -6,12 +6,12 @@ import "github.com/charmbracelet/gum/style" // nolint:staticcheck type Options struct { Indicator string `help:"Character for selection" default:"•"` - IndicatorStyle style.Styles `embed:"" prefix:"indicator." set:"defaultForeground=212" set:"name=indicator"` + IndicatorStyle style.Styles `embed:"" prefix:"indicator." set:"defaultForeground=212"` TextStyle style.Styles `embed:"" prefix:"text."` - MatchStyle style.Styles `embed:"" prefix:"match." set:"defaultForeground=212" set:"name=matched text"` + MatchStyle style.Styles `embed:"" prefix:"match." set:"defaultForeground=212"` Placeholder string `help:"Placeholder value" default:"Filter..."` Prompt string `help:"Prompt to display" default:"> "` - PromptStyle style.Styles `embed:"" prefix:"prompt." set:"defaultForeground=240" set:"name=prompt"` + PromptStyle style.Styles `embed:"" prefix:"prompt." set:"defaultForeground=240"` Width int `help:"Input width" default:"20"` Height int `help:"Input height" default:"0"` } diff --git a/gum.go b/gum.go index f7c2823..a2f5e58 100644 --- a/gum.go +++ b/gum.go @@ -18,13 +18,13 @@ import ( // Gum is the command-line interface for Gum. type Gum struct { // Version is a flag that can be used to display the version number. - Version kong.VersionFlag `short:"v" help:"Print the version number"` + Version kong.VersionFlag `short:"v" help:"Print the version number" env:"-"` // Completion generates Gum shell completion scripts. - Completion completion.Completion `cmd:"" hidden:"" help:"Request shell completion"` + Completion completion.Completion `cmd:"" hidden:"" help:"Request shell completion" env:"-"` // Man is a hidden command that generates Gum man pages. - Man man.Man `cmd:"" hidden:"" help:"Generate man pages"` + Man man.Man `cmd:"" hidden:"" help:"Generate man pages" env:"-"` // Choose provides an interface to choose one option from a given list of // options. The options can be provided as (new-line separated) stdin or a diff --git a/input/options.go b/input/options.go index 7b410fa..fa3d66d 100644 --- a/input/options.go +++ b/input/options.go @@ -7,8 +7,8 @@ import "github.com/charmbracelet/gum/style" type Options struct { Placeholder string `help:"Placeholder value" default:"Type something..."` Prompt string `help:"Prompt to display" default:"> "` - PromptStyle style.Styles `embed:"" prefix:"prompt." set:"name=prompt"` - CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212" set:"name=cursor"` + PromptStyle style.Styles `embed:"" prefix:"prompt."` + CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212"` Value string `help:"Initial value (can also be passed via stdin)" default:""` CharLimit int `help:"Maximum value length (0 for no limit)" default:"400"` Width int `help:"Input width" default:"40"` diff --git a/spin/options.go b/spin/options.go index 80e1c57..1b48be5 100644 --- a/spin/options.go +++ b/spin/options.go @@ -7,9 +7,9 @@ import "github.com/charmbracelet/gum/style" type Options struct { Command []string `arg:"" help:"Command to run"` - Spinner string `help:"Spinner type" short:"s" type:"spinner" enum:"line,dot,minidot,jump,pulse,points,globe,moon,monkey,meter,hamburger" default:"dot"` - SpinnerStyle style.Styles `embed:"" prefix:"spinner." set:"defaultForeground=212" set:"name=spinner"` - Title string `help:"Text to display to user while spinning" default:"Loading..."` - TitleStyle style.Styles `embed:"" prefix:"title." set:"name=title"` ShowOutput bool `help:"Show output of command" default:"false"` + Spinner string `help:"Spinner type" short:"s" type:"spinner" enum:"line,dot,minidot,jump,pulse,points,globe,moon,monkey,meter,hamburger" default:"dot"` + SpinnerStyle style.Styles `embed:"" prefix:"spinner." set:"defaultForeground=212"` + Title string `help:"Text to display to user while spinning" default:"Loading..."` + TitleStyle style.Styles `embed:"" prefix:"title."` } diff --git a/write/options.go b/write/options.go index 38dc0be..411df24 100644 --- a/write/options.go +++ b/write/options.go @@ -14,12 +14,12 @@ type Options struct { Value string `help:"Initial value (can be passed via stdin)" default:""` CharLimit int `help:"Maximum value length (0 for no limit)" default:"400"` - BaseStyle style.Styles `embed:"" prefix:"base." set:"name=base"` - CursorLineNumberStyle style.Styles `embed:"" prefix:"cursor-line-number." set:"defaultForeground=7" set:"name=cursor line number"` - CursorLineStyle style.Styles `embed:"" prefix:"cursor-line." set:"name=cursor line"` - CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212" set:"name=cursor"` - EndOfBufferStyle style.Styles `embed:"" prefix:"end-of-buffer." set:"defaultForeground=0" set:"name=end of buffer"` - LineNumberStyle style.Styles `embed:"" prefix:"line-number." set:"defaultForeground=7" set:"name=line number"` - PlaceholderStyle style.Styles `embed:"" prefix:"placeholder." set:"defaultForeground=240" set:"name=placeholder"` - PromptStyle style.Styles `embed:"" prefix:"prompt." set:"defaultForeground=7" set:"name=prompt"` + BaseStyle style.Styles `embed:"" prefix:"base."` + CursorLineNumberStyle style.Styles `embed:"" prefix:"cursor-line-number." set:"defaultForeground=7"` + CursorLineStyle style.Styles `embed:"" prefix:"cursor-line."` + CursorStyle style.Styles `embed:"" prefix:"cursor." set:"defaultForeground=212"` + EndOfBufferStyle style.Styles `embed:"" prefix:"end-of-buffer." set:"defaultForeground=0"` + LineNumberStyle style.Styles `embed:"" prefix:"line-number." set:"defaultForeground=7"` + PlaceholderStyle style.Styles `embed:"" prefix:"placeholder." set:"defaultForeground=240"` + PromptStyle style.Styles `embed:"" prefix:"prompt." set:"defaultForeground=7"` }