From 6f8ad918240fecc10ef4ef93768853157287c13d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 24 Apr 2020 12:59:40 -0400 Subject: [PATCH] gofmt fixes --- commands/account/mkdir.go | 2 +- commands/choose.go | 2 +- commands/compose/send.go | 2 +- commands/exec.go | 2 +- commands/msg/archive.go | 2 +- commands/msg/copy.go | 2 +- commands/msg/delete.go | 2 +- commands/msg/modify-labels.go | 2 +- commands/msg/move.go | 2 +- commands/msg/pipe.go | 2 +- commands/msg/read.go | 4 ++-- commands/term.go | 2 +- widgets/account-wizard.go | 6 +++--- widgets/aerc.go | 8 ++++---- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/commands/account/mkdir.go b/commands/account/mkdir.go index 9d16063..4352a42 100644 --- a/commands/account/mkdir.go +++ b/commands/account/mkdir.go @@ -40,7 +40,7 @@ func (MakeDir) Execute(aerc *widgets.Aerc, args []string) error { aerc.PushStatus("Directory created.", 10*time.Second) acct.Directories().Select(name) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/choose.go b/commands/choose.go index 5bf36b1..6fa91be 100644 --- a/commands/choose.go +++ b/commands/choose.go @@ -27,7 +27,7 @@ func (Choose) Execute(aerc *widgets.Aerc, args []string) error { } choices := []widgets.Choice{} - for i := 0; i+4 < len(args); i+=4 { + for i := 0; i+4 < len(args); i += 4 { if args[i+1] != "-o" { return chooseUsage(args[0]) } diff --git a/commands/compose/send.go b/commands/compose/send.go index f726a60..43201db 100644 --- a/commands/compose/send.go +++ b/commands/compose/send.go @@ -246,7 +246,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error { r.Close() composer.Close() case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) r.Close() composer.Close() } diff --git a/commands/exec.go b/commands/exec.go index e90652d..e15afbe 100644 --- a/commands/exec.go +++ b/commands/exec.go @@ -33,7 +33,7 @@ func (ExecCmd) Execute(aerc *widgets.Aerc, args []string) error { go func() { err := cmd.Run() if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } else { color := tcell.ColorDefault if cmd.ProcessState.ExitCode() != 0 { diff --git a/commands/msg/archive.go b/commands/msg/archive.go index b7a14e7..5561674 100644 --- a/commands/msg/archive.go +++ b/commands/msg/archive.go @@ -86,7 +86,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error { case *types.Done: wg.Done() case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) success = false wg.Done() } diff --git a/commands/msg/copy.go b/commands/msg/copy.go index c2f79c6..3eca565 100644 --- a/commands/msg/copy.go +++ b/commands/msg/copy.go @@ -60,7 +60,7 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error { case *types.Done: aerc.PushStatus("Messages copied.", 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/delete.go b/commands/msg/delete.go index 39a9cc5..0d2c1c5 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -47,7 +47,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error { case *types.Done: aerc.PushStatus("Messages deleted.", 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go index 6fcd6ed..92899ec 100644 --- a/commands/msg/modify-labels.go +++ b/commands/msg/modify-labels.go @@ -58,7 +58,7 @@ func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error { case *types.Done: aerc.PushStatus("labels updated", 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/move.go b/commands/msg/move.go index 182817e..9542613 100644 --- a/commands/msg/move.go +++ b/commands/msg/move.go @@ -71,7 +71,7 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error { case *types.Done: aerc.PushStatus("Message moved to "+joinedArgs, 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) return nil diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go index 136d533..9fbc3ac 100644 --- a/commands/msg/pipe.go +++ b/commands/msg/pipe.go @@ -93,7 +93,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error { }() err = ecmd.Run() if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } else { color := tcell.ColorDefault if ecmd.ProcessState.ExitCode() != 0 { diff --git a/commands/msg/read.go b/commands/msg/read.go index 8613f3f..8b0c7b1 100644 --- a/commands/msg/read.go +++ b/commands/msg/read.go @@ -93,7 +93,7 @@ func submitReadChange(aerc *widgets.Aerc, store *lib.MessageStore, case *types.Done: aerc.PushStatus(msg_success, 10*time.Second) case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) } }) } @@ -106,7 +106,7 @@ func submitReadChangeWg(aerc *widgets.Aerc, store *lib.MessageStore, case *types.Done: wg.Done() case *types.Error: - aerc.PushError(" "+msg.Error.Error()) + aerc.PushError(" " + msg.Error.Error()) *success = false wg.Done() } diff --git a/commands/term.go b/commands/term.go index c75fda5..00f6937 100644 --- a/commands/term.go +++ b/commands/term.go @@ -46,7 +46,7 @@ func TermCore(aerc *widgets.Aerc, args []string) error { term.OnClose = func(err error) { aerc.RemoveTab(term) if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } } return nil diff --git a/widgets/account-wizard.go b/widgets/account-wizard.go index e9bd843..6f93367 100644 --- a/widgets/account-wizard.go +++ b/widgets/account-wizard.go @@ -414,7 +414,7 @@ func (wizard *AccountWizard) ConfigureTemporaryAccount(temporary bool) { func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) { if d == nil { - wizard.aerc.PushError(" "+err.Error()) + wizard.aerc.PushError(" " + err.Error()) wizard.Invalidate() return } @@ -429,7 +429,7 @@ func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) { wizard.step = step wizard.focus = focus wizard.Focus(true) - wizard.aerc.PushError(" "+err.Error()) + wizard.aerc.PushError(" " + err.Error()) wizard.Invalidate() return } @@ -540,7 +540,7 @@ func (wizard *AccountWizard) finish(tutorial bool) { term.OnClose = func(err error) { wizard.aerc.RemoveTab(term) if err != nil { - wizard.aerc.PushError(" "+err.Error()) + wizard.aerc.PushError(" " + err.Error()) } } } diff --git a/widgets/aerc.go b/widgets/aerc.go index 779e386..23b8901 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -416,11 +416,11 @@ func (aerc *Aerc) BeginExCommand(cmd string) { exline := NewExLine(aerc.conf, cmd, func(cmd string) { parts, err := shlex.Split(cmd) if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } err = aerc.cmd(parts) if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } // only add to history if this is an unsimulated command, // ie one not executed from a keybinding @@ -444,7 +444,7 @@ func (aerc *Aerc) RegisterPrompt(prompt string, cmd []string) { } err := aerc.cmd(cmd) if err != nil { - aerc.PushError(" "+err.Error()) + aerc.PushError(" " + err.Error()) } }, func(cmd string) []string { return nil // TODO: completions @@ -458,7 +458,7 @@ func (aerc *Aerc) RegisterChoices(choices []Choice) { for _, c := range choices { text := fmt.Sprintf("[%s] %s", c.Key, c.Text) if strings.Contains(c.Text, c.Key) { - text = strings.Replace(c.Text, c.Key, "[" + c.Key + "]", 1) + text = strings.Replace(c.Text, c.Key, "["+c.Key+"]", 1) } texts = append(texts, text) cmds[c.Key] = c.Command