From 7274da43d7e3c8b8941f325156382029d8bac58d Mon Sep 17 00:00:00 2001 From: Luca Zambarda Date: Wed, 2 Nov 2022 09:29:41 +0000 Subject: [PATCH] fix(zsh): send request with correct arguments --- graph/naive/naive.go | 11 +++++++---- server/server.go | 5 +++-- zsh/hbt.zsh | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/graph/naive/naive.go b/graph/naive/naive.go index 7507fd3..64aec02 100644 --- a/graph/naive/naive.go +++ b/graph/naive/naive.go @@ -1,6 +1,7 @@ -//nolint:godox // Okay for now. // Package naive contains a simplistic implementation of a suggestion graph. // Nothing too fancy. +// +//nolint:godox // Okay for now. package naive import ( @@ -21,8 +22,9 @@ type edge struct { To *node `json:"t"` } -//nolint:govet // Prefer this order of memory efficiency. // cmd -> node. +// +//nolint:govet // Prefer this order of memory efficiency. type node struct { id int edges map[string]*edge @@ -38,7 +40,7 @@ func (c *cmdEdge) String() string { } func (n *node) getSortedEdges() []*cmdEdge { - var sorted = make([]*cmdEdge, 0, len(n.edges)) + sorted := make([]*cmdEdge, 0, len(n.edges)) for cmd, e := range n.edges { sorted = append(sorted, &cmdEdge{cmd, e.Hits}) } @@ -49,7 +51,7 @@ func (n *node) getSortedEdges() []*cmdEdge { } func (n *node) getBestCommand() string { - var max = -1 + max := -1 var best string for cmd, e := range n.edges { if e.Hits > max { @@ -82,6 +84,7 @@ func (w walker) progress(next *walkerNode) walker { // Graph is a naive implementation of a heuristic system. // The zero value of this structure cannot be used. Please use NewGraph to // obtain a valid one. +// //nolint:govet // Prefer this order of memory efficiency. type Graph struct { // wd -> node diff --git a/server/server.go b/server/server.go index 646e154..091f457 100644 --- a/server/server.go +++ b/server/server.go @@ -93,13 +93,13 @@ func handleConnection(c net.Conn, g Graph) { } result, err := ProcessCommand(args, g) if err != nil { - println(err) + fmt.Println(err) return } if result != "" { _, err = c.Write([]byte(result)) if err != nil { - println(err) + fmt.Println(err) } } } @@ -109,6 +109,7 @@ func ProcessCommand(args []string, g Graph) (result string, err error) { if len(args) == 0 { return "", errors.New("missing command") } + switch args[0] { case "track": if len(args) != 4 { diff --git a/zsh/hbt.zsh b/zsh/hbt.zsh index d3a37de..96bd5c5 100644 --- a/zsh/hbt.zsh +++ b/zsh/hbt.zsh @@ -40,7 +40,7 @@ add-zsh-hook preexec _hbt_track # or complete words, that are before cursor only (like in tcsh) function _hbt_search () { if [[ -z ${LBUFFER// } ]]; then - suggestion=$(echo -n "hint\n$$\n$(pwd)\n$1" | nc localhost $HBT_PORT) + suggestion=$(echo -n "hint\n$$\n$(pwd)" | nc localhost $HBT_PORT) POSTDISPLAY="${suggestion#$BUFFER}" _zsh_autosuggest_highlight_reset _zsh_autosuggest_highlight_apply