From c1ffd8b12890dab523314f949fbe902c41fbd117 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 14 Feb 2026 17:36:53 +0900 Subject: [PATCH] go fmt ./... --- action.go | 2 +- config.go | 6 ++--- filter/interface.go | 2 +- hub/interface.go | 4 +-- internal/keyseq/keys.go | 6 ++--- internal/keyseq/ternary_test.go | 1 - internal/util/homedir_posix.go | 1 + internal/util/shell_unix.go | 7 +++--- internal/util/shell_windows.go | 7 +++--- internal/util/tty_bsd.go | 1 + internal/util/tty_posix.go | 1 + keymap.go | 1 - line/interface.go | 2 -- line/matched.go | 1 - line/raw.go | 1 - peco_test.go | 43 ++++++++++++++++---------------- screen.go | 44 ++++++++++++++++----------------- screen_posix.go | 1 + 18 files changed, 65 insertions(+), 66 deletions(-) diff --git a/action.go b/action.go index 99282fa..7a447b2 100644 --- a/action.go +++ b/action.go @@ -331,7 +331,7 @@ func doFinish(ctx context.Context, state *Peco, _ Event) { }) var err error - state.Hub().SendStatusMsg(ctx, "Executing " + ccarg) + state.Hub().SendStatusMsg(ctx, "Executing "+ccarg) cmd := util.Shell(ccarg) cmd.Stdin = &stdin cmd.Stdout = state.Stdout diff --git a/config.go b/config.go index 78ab5ed..6c1b2cf 100644 --- a/config.go +++ b/config.go @@ -5,8 +5,8 @@ import ( "fmt" "os" "path/filepath" - "strings" "strconv" + "strings" "github.com/peco/peco/filter" "github.com/peco/peco/internal/util" @@ -139,7 +139,7 @@ func stringsToStyle(style *Style, raw []string) error { } } else { if fg, err := strconv.ParseUint(s, 10, 8); err == nil { - style.fg = Attribute(fg+1) + style.fg = Attribute(fg + 1) } } @@ -153,7 +153,7 @@ func stringsToStyle(style *Style, raw []string) error { } else { if strings.HasPrefix(s, "on_") { if bg, err := strconv.ParseUint(s[3:], 10, 8); err == nil { - style.bg = Attribute(bg+1) + style.bg = Attribute(bg + 1) } } } diff --git a/filter/interface.go b/filter/interface.go index e98f7de..241d547 100644 --- a/filter/interface.go +++ b/filter/interface.go @@ -56,7 +56,7 @@ type Regexp struct { quotemeta bool mutex sync.Mutex name string - outCh pipeline.ChanOutput + outCh pipeline.ChanOutput } type ExternalCmd struct { diff --git a/hub/interface.go b/hub/interface.go index b269fe3..84a66ec 100644 --- a/hub/interface.go +++ b/hub/interface.go @@ -34,6 +34,6 @@ type Payload interface { type payload struct { batch bool - data interface{} - done chan struct{} + data interface{} + done chan struct{} } diff --git a/internal/keyseq/keys.go b/internal/keyseq/keys.go index 98a6849..892831a 100644 --- a/internal/keyseq/keys.go +++ b/internal/keyseq/keys.go @@ -16,7 +16,7 @@ type KeyType uint16 // Function keys const ( - KeyF1 KeyType = 0xFFFF - iota + KeyF1 KeyType = 0xFFFF - iota KeyF2 KeyF3 KeyF4 @@ -45,8 +45,8 @@ const ( // and MouseLeft, so MouseLeft = KeyArrowRight - 2 (not -1). const ( MouseLeft KeyType = 0xFFFF - iota - 23 // KeyArrowRight - 2 - MouseMiddle // KeyArrowRight - 3 - MouseRight // KeyArrowRight - 4 + MouseMiddle // KeyArrowRight - 3 + MouseRight // KeyArrowRight - 4 ) // Ctrl keys and special keys. diff --git a/internal/keyseq/ternary_test.go b/internal/keyseq/ternary_test.go index 4c90b46..df491ba 100644 --- a/internal/keyseq/ternary_test.go +++ b/internal/keyseq/ternary_test.go @@ -2,7 +2,6 @@ package keyseq import "testing" - func TestBalance(t *testing.T) { trie := NewTernaryTrie() diff --git a/internal/util/homedir_posix.go b/internal/util/homedir_posix.go index 543d091..cea876e 100644 --- a/internal/util/homedir_posix.go +++ b/internal/util/homedir_posix.go @@ -1,3 +1,4 @@ +//go:build !darwin && !windows // +build !darwin,!windows package util diff --git a/internal/util/shell_unix.go b/internal/util/shell_unix.go index 6233eff..9ddd5b4 100644 --- a/internal/util/shell_unix.go +++ b/internal/util/shell_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package util @@ -6,13 +7,13 @@ import "os/exec" func Shell(cmd ...string) *exec.Cmd { const shellpath = `/bin/sh` - const shellopt = `-c` + const shellopt = `-c` - args := make([]string, len(cmd) + 1) + args := make([]string, len(cmd)+1) args[0] = shellopt for i := 0; i < len(cmd); i++ { args[i+1] = cmd[i] } - + return exec.Command(shellpath, args...) } diff --git a/internal/util/shell_windows.go b/internal/util/shell_windows.go index 8bc58cd..d22d2f1 100644 --- a/internal/util/shell_windows.go +++ b/internal/util/shell_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package util @@ -6,13 +7,13 @@ import "os/exec" func Shell(cmd ...string) *exec.Cmd { const shellpath = `cmd` - const shellopt = `/c` + const shellopt = `/c` - args := make([]string, len(cmd) + 1) + args := make([]string, len(cmd)+1) args[0] = shellopt for i := 0; i < len(cmd); i++ { args[i+1] = cmd[i] } - + return exec.Command(shellpath, args...) } diff --git a/internal/util/tty_bsd.go b/internal/util/tty_bsd.go index 9152012..edb68cb 100644 --- a/internal/util/tty_bsd.go +++ b/internal/util/tty_bsd.go @@ -1,3 +1,4 @@ +//go:build darwin || freebsd || openbsd || netbsd || dragonfly // +build darwin freebsd openbsd netbsd dragonfly package util diff --git a/internal/util/tty_posix.go b/internal/util/tty_posix.go index ddc09ce..22fc941 100644 --- a/internal/util/tty_posix.go +++ b/internal/util/tty_posix.go @@ -1,3 +1,4 @@ +//go:build !darwin && !windows && !freebsd && !openbsd && !netbsd && !dragonfly // +build !darwin,!windows,!freebsd,!openbsd,!netbsd,!dragonfly package util diff --git a/keymap.go b/keymap.go index 292013e..becbbff 100644 --- a/keymap.go +++ b/keymap.go @@ -180,4 +180,3 @@ func (km *Keymap) ApplyKeybinding() error { return errors.Wrap(k.Compile(), "failed to compile key binding patterns") } - diff --git a/line/interface.go b/line/interface.go index cc7d42f..158bd34 100644 --- a/line/interface.go +++ b/line/interface.go @@ -49,5 +49,3 @@ type Matched struct { Line indices [][]int } - - diff --git a/line/matched.go b/line/matched.go index 6bcd747..cfc3dea 100644 --- a/line/matched.go +++ b/line/matched.go @@ -9,4 +9,3 @@ func NewMatched(rl Line, matches [][]int) *Matched { func (ml Matched) Indices() [][]int { return ml.indices } - diff --git a/line/raw.go b/line/raw.go index a29c736..ef6d2c0 100644 --- a/line/raw.go +++ b/line/raw.go @@ -76,4 +76,3 @@ func (rl *Raw) Output() string { } return rl.buf } - diff --git a/peco_test.go b/peco_test.go index 05ce10d..61d031e 100644 --- a/peco_test.go +++ b/peco_test.go @@ -90,28 +90,28 @@ func newPeco() *Peco { // keyseqToTcellKey maps peco keyseq navigation/function key constants back // to tcell key constants, for injecting events into SimulationScreen. var keyseqToTcellKey = map[keyseq.KeyType]tcell.Key{ - keyseq.KeyArrowUp: tcell.KeyUp, - keyseq.KeyArrowDown: tcell.KeyDown, - keyseq.KeyArrowLeft: tcell.KeyLeft, + keyseq.KeyArrowUp: tcell.KeyUp, + keyseq.KeyArrowDown: tcell.KeyDown, + keyseq.KeyArrowLeft: tcell.KeyLeft, keyseq.KeyArrowRight: tcell.KeyRight, - keyseq.KeyInsert: tcell.KeyInsert, - keyseq.KeyDelete: tcell.KeyDelete, - keyseq.KeyHome: tcell.KeyHome, - keyseq.KeyEnd: tcell.KeyEnd, - keyseq.KeyPgup: tcell.KeyPgUp, - keyseq.KeyPgdn: tcell.KeyPgDn, - keyseq.KeyF1: tcell.KeyF1, - keyseq.KeyF2: tcell.KeyF2, - keyseq.KeyF3: tcell.KeyF3, - keyseq.KeyF4: tcell.KeyF4, - keyseq.KeyF5: tcell.KeyF5, - keyseq.KeyF6: tcell.KeyF6, - keyseq.KeyF7: tcell.KeyF7, - keyseq.KeyF8: tcell.KeyF8, - keyseq.KeyF9: tcell.KeyF9, - keyseq.KeyF10: tcell.KeyF10, - keyseq.KeyF11: tcell.KeyF11, - keyseq.KeyF12: tcell.KeyF12, + keyseq.KeyInsert: tcell.KeyInsert, + keyseq.KeyDelete: tcell.KeyDelete, + keyseq.KeyHome: tcell.KeyHome, + keyseq.KeyEnd: tcell.KeyEnd, + keyseq.KeyPgup: tcell.KeyPgUp, + keyseq.KeyPgdn: tcell.KeyPgDn, + keyseq.KeyF1: tcell.KeyF1, + keyseq.KeyF2: tcell.KeyF2, + keyseq.KeyF3: tcell.KeyF3, + keyseq.KeyF4: tcell.KeyF4, + keyseq.KeyF5: tcell.KeyF5, + keyseq.KeyF6: tcell.KeyF6, + keyseq.KeyF7: tcell.KeyF7, + keyseq.KeyF8: tcell.KeyF8, + keyseq.KeyF9: tcell.KeyF9, + keyseq.KeyF10: tcell.KeyF10, + keyseq.KeyF11: tcell.KeyF11, + keyseq.KeyF12: tcell.KeyF12, } // SimScreen wraps tcell.SimulationScreen to implement peco's Screen interface. @@ -275,7 +275,6 @@ func TestPeco(t *testing.T) { } } - func TestPecoHelp(t *testing.T) { p := newPeco() p.Argv = []string{"peco", "-h"} diff --git a/screen.go b/screen.go index 7a67f9f..25bc38b 100644 --- a/screen.go +++ b/screen.go @@ -23,28 +23,28 @@ type Termbox struct { // tcellKeyToKeyseq maps tcell navigation/function key constants to peco keyseq constants. var tcellKeyToKeyseq = map[tcell.Key]keyseq.KeyType{ - tcell.KeyUp: keyseq.KeyArrowUp, - tcell.KeyDown: keyseq.KeyArrowDown, - tcell.KeyLeft: keyseq.KeyArrowLeft, - tcell.KeyRight: keyseq.KeyArrowRight, - tcell.KeyInsert: keyseq.KeyInsert, - tcell.KeyDelete: keyseq.KeyDelete, - tcell.KeyHome: keyseq.KeyHome, - tcell.KeyEnd: keyseq.KeyEnd, - tcell.KeyPgUp: keyseq.KeyPgup, - tcell.KeyPgDn: keyseq.KeyPgdn, - tcell.KeyF1: keyseq.KeyF1, - tcell.KeyF2: keyseq.KeyF2, - tcell.KeyF3: keyseq.KeyF3, - tcell.KeyF4: keyseq.KeyF4, - tcell.KeyF5: keyseq.KeyF5, - tcell.KeyF6: keyseq.KeyF6, - tcell.KeyF7: keyseq.KeyF7, - tcell.KeyF8: keyseq.KeyF8, - tcell.KeyF9: keyseq.KeyF9, - tcell.KeyF10: keyseq.KeyF10, - tcell.KeyF11: keyseq.KeyF11, - tcell.KeyF12: keyseq.KeyF12, + tcell.KeyUp: keyseq.KeyArrowUp, + tcell.KeyDown: keyseq.KeyArrowDown, + tcell.KeyLeft: keyseq.KeyArrowLeft, + tcell.KeyRight: keyseq.KeyArrowRight, + tcell.KeyInsert: keyseq.KeyInsert, + tcell.KeyDelete: keyseq.KeyDelete, + tcell.KeyHome: keyseq.KeyHome, + tcell.KeyEnd: keyseq.KeyEnd, + tcell.KeyPgUp: keyseq.KeyPgup, + tcell.KeyPgDn: keyseq.KeyPgdn, + tcell.KeyF1: keyseq.KeyF1, + tcell.KeyF2: keyseq.KeyF2, + tcell.KeyF3: keyseq.KeyF3, + tcell.KeyF4: keyseq.KeyF4, + tcell.KeyF5: keyseq.KeyF5, + tcell.KeyF6: keyseq.KeyF6, + tcell.KeyF7: keyseq.KeyF7, + tcell.KeyF8: keyseq.KeyF8, + tcell.KeyF9: keyseq.KeyF9, + tcell.KeyF10: keyseq.KeyF10, + tcell.KeyF11: keyseq.KeyF11, + tcell.KeyF12: keyseq.KeyF12, tcell.KeyBackspace: keyseq.KeyBackspace, tcell.KeyTab: keyseq.KeyTab, tcell.KeyEnter: keyseq.KeyEnter, diff --git a/screen_posix.go b/screen_posix.go index 58abae4..4fceee6 100644 --- a/screen_posix.go +++ b/screen_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package peco