From 272d93110a4cd48b414c3f69c75a214d0cd0621f Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Sat, 5 Jul 2025 16:37:19 +0200 Subject: [PATCH] chore: lint --- cmd/root.go | 8 ++++---- internal/app/app.go | 5 +++-- internal/config/init.go | 3 +-- internal/config/load_test.go | 2 +- internal/config/resolve.go | 2 +- internal/db/connect.go | 2 +- internal/fsext/fileutil.go | 3 ++- internal/llm/agent/mcp-tools.go | 3 ++- internal/llm/prompt/coder.go | 2 +- internal/llm/provider/vertexai.go | 2 +- internal/llm/tools/edit.go | 3 ++- internal/llm/tools/glob.go | 2 +- internal/llm/tools/write.go | 3 ++- internal/lsp/handlers.go | 3 ++- internal/lsp/transport.go | 2 +- internal/lsp/watcher/watcher.go | 3 ++- internal/tui/components/chat/sidebar/sidebar.go | 3 +-- internal/tui/components/core/layout/split.go | 4 +++- internal/tui/components/core/status/status.go | 1 - main.go | 3 ++- 20 files changed, 33 insertions(+), 26 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 840bc58f8803965f71630b0bcce04e249708ee2a..c28c2399f6269801b640a5c018788c358da5685c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -93,7 +93,7 @@ to assist developers in writing, debugging, and understanding code directly from app, err := app.New(ctx, conn) if err != nil { - slog.Error("Failed to create app: %v", err) + slog.Error(fmt.Sprintf("Failed to create app instance: %v", err)) return err } // Defer shutdown here so it runs for both interactive and non-interactive modes @@ -104,7 +104,7 @@ to assist developers in writing, debugging, and understanding code directly from prompt, err = maybePrependStdin(prompt) if err != nil { - slog.Error("Failed to read stdin: %v", err) + slog.Error(fmt.Sprintf("Failed to read from stdin: %v", err)) return err } @@ -174,11 +174,11 @@ to assist developers in writing, debugging, and understanding code directly from cleanup() if err != nil { - slog.Error("TUI error: %v", err) + slog.Error(fmt.Sprintf("TUI run error: %v", err)) return fmt.Errorf("TUI error: %v", err) } - slog.Info("TUI exited with result: %v", result) + slog.Info(fmt.Sprintf("TUI exited with result: %v", result)) return nil }, } diff --git a/internal/app/app.go b/internal/app/app.go index 304b0dcb73421132750d4be67564f3d95157d1e7..4c130c40bfbbdbcdd1608ceb39819e32b84ecc07 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -5,6 +5,7 @@ import ( "database/sql" "errors" "fmt" + "log/slog" "maps" "sync" "time" @@ -14,7 +15,7 @@ import ( "github.com/charmbracelet/crush/internal/format" "github.com/charmbracelet/crush/internal/history" "github.com/charmbracelet/crush/internal/llm/agent" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/message" "github.com/charmbracelet/crush/internal/permission" @@ -73,7 +74,7 @@ func New(ctx context.Context, conn *sql.DB) (*App, error) { app.LSPClients, ) if err != nil { - slog.Error("Failed to create coder agent", err) + slog.Error("Failed to create coder agent", "err", err) return nil, err } diff --git a/internal/config/init.go b/internal/config/init.go index 30818f1881f79663bf7e6045d4656046f73ed99e..852191376c79b31cc955730804f6b8738b9f302d 100644 --- a/internal/config/init.go +++ b/internal/config/init.go @@ -2,13 +2,12 @@ package config import ( "fmt" + "log/slog" "os" "path/filepath" "strings" "sync" "sync/atomic" - - "log/slog" ) const ( diff --git a/internal/config/load_test.go b/internal/config/load_test.go index 0f46f7899b2e443e9f99c646d13370c3a2e146d4..ba1a5a7f1c52d5cd123750f93032e56939ce2cd5 100644 --- a/internal/config/load_test.go +++ b/internal/config/load_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/charmbracelet/crush/internal/fur/provider" "github.com/charmbracelet/crush/internal/env" + "github.com/charmbracelet/crush/internal/fur/provider" "github.com/stretchr/testify/assert" ) diff --git a/internal/config/resolve.go b/internal/config/resolve.go index 776897e78be6fb4f20058e700cf2906d1072fc4b..71eee9b0ea62b9c436bc4f8ce204ffa1583a840c 100644 --- a/internal/config/resolve.go +++ b/internal/config/resolve.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/charmbracelet/crush/internal/shell" "github.com/charmbracelet/crush/internal/env" + "github.com/charmbracelet/crush/internal/shell" ) type VariableResolver interface { diff --git a/internal/db/connect.go b/internal/db/connect.go index 24dc486d2d19bffda6e816e1b915a3f8de3a62ab..1830d64af4558e7690b00415af073073aff70398 100644 --- a/internal/db/connect.go +++ b/internal/db/connect.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "fmt" + "log/slog" "os" "path/filepath" @@ -11,7 +12,6 @@ import ( _ "github.com/ncruces/go-sqlite3/embed" "github.com/charmbracelet/crush/internal/config" - "log/slog" "github.com/pressly/goose/v3" ) diff --git a/internal/fsext/fileutil.go b/internal/fsext/fileutil.go index 3a95bec4ff418eacbefb476ff334ec904eda1c39..e350b61f6c4fd02c0088cc1f2f5c35c0bbc45259 100644 --- a/internal/fsext/fileutil.go +++ b/internal/fsext/fileutil.go @@ -2,6 +2,7 @@ package fsext import ( "fmt" + "log/slog" "os" "os/exec" "path/filepath" @@ -11,7 +12,7 @@ import ( "github.com/bmatcuk/doublestar/v4" "github.com/charlievieth/fastwalk" - "log/slog" + ignore "github.com/sabhiram/go-gitignore" ) diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go index 5392e4f1e4d4f052c0df07dcbfcc008ada8d8aa4..a0826bdf75895c378aac8d0c4a823b9a094a5e79 100644 --- a/internal/llm/agent/mcp-tools.go +++ b/internal/llm/agent/mcp-tools.go @@ -4,10 +4,11 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/llm/tools" - "log/slog" + "github.com/charmbracelet/crush/internal/permission" "github.com/charmbracelet/crush/internal/version" diff --git a/internal/llm/prompt/coder.go b/internal/llm/prompt/coder.go index 2ac17247123bcf283a453bbbb8ccec8776dc5917..24b90c0fab792b03591e486534a52e4139178bf4 100644 --- a/internal/llm/prompt/coder.go +++ b/internal/llm/prompt/coder.go @@ -3,6 +3,7 @@ package prompt import ( "context" "fmt" + "log/slog" "os" "path/filepath" "runtime" @@ -11,7 +12,6 @@ import ( "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/fur/provider" "github.com/charmbracelet/crush/internal/llm/tools" - "log/slog" ) func CoderPrompt(p string, contextFiles ...string) string { diff --git a/internal/llm/provider/vertexai.go b/internal/llm/provider/vertexai.go index 76f21eef1c3f6ac132451d53b0852e584ef688f2..1baa08927dcfacd40e3dc3a9909311b7be452826 100644 --- a/internal/llm/provider/vertexai.go +++ b/internal/llm/provider/vertexai.go @@ -2,8 +2,8 @@ package provider import ( "context" - "log/slog" + "google.golang.org/genai" ) diff --git a/internal/llm/tools/edit.go b/internal/llm/tools/edit.go index 3d8775b287da28c072ecd66aba38054581c2da4c..d50dfa666f150bf62a94667e292a4023293bc059 100644 --- a/internal/llm/tools/edit.go +++ b/internal/llm/tools/edit.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "os" "path/filepath" "strings" @@ -12,7 +13,7 @@ import ( "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/diff" "github.com/charmbracelet/crush/internal/history" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/permission" ) diff --git a/internal/llm/tools/glob.go b/internal/llm/tools/glob.go index 535220bb691002d77e75fcfe405e392de86272f5..8dcd7c07586f98c87290ebe83e02a7dddd613a40 100644 --- a/internal/llm/tools/glob.go +++ b/internal/llm/tools/glob.go @@ -5,6 +5,7 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "os/exec" "path/filepath" "sort" @@ -12,7 +13,6 @@ import ( "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/fsext" - "log/slog" ) const ( diff --git a/internal/llm/tools/write.go b/internal/llm/tools/write.go index 95bd74787534cd3d3638cfc92427008f51708148..432964e16c490d5bed1a115c14be41b27bafcb80 100644 --- a/internal/llm/tools/write.go +++ b/internal/llm/tools/write.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "os" "path/filepath" "strings" @@ -12,7 +13,7 @@ import ( "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/diff" "github.com/charmbracelet/crush/internal/history" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/permission" ) diff --git a/internal/lsp/handlers.go b/internal/lsp/handlers.go index b85e208eb9bc9c19b02a67d01e64e9ef88a9668b..725d3c3c77ffba465b3e644a9948a1ce56c3eeaa 100644 --- a/internal/lsp/handlers.go +++ b/internal/lsp/handlers.go @@ -2,9 +2,10 @@ package lsp import ( "encoding/json" + "log/slog" "github.com/charmbracelet/crush/internal/config" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp/protocol" "github.com/charmbracelet/crush/internal/lsp/util" ) diff --git a/internal/lsp/transport.go b/internal/lsp/transport.go index 527c4dbd0748fdfbca75b6506d48337fed4c8bfb..431a099fa1cda5e5035de7ce6c10ef3761e397ea 100644 --- a/internal/lsp/transport.go +++ b/internal/lsp/transport.go @@ -6,10 +6,10 @@ import ( "encoding/json" "fmt" "io" + "log/slog" "strings" "github.com/charmbracelet/crush/internal/config" - "log/slog" ) // Write writes an LSP message to the given writer diff --git a/internal/lsp/watcher/watcher.go b/internal/lsp/watcher/watcher.go index afded8fd04f09d9c8590ea0818364b3310619e3b..a6d27f057e06ea7026a6eed0308979991a44fb9d 100644 --- a/internal/lsp/watcher/watcher.go +++ b/internal/lsp/watcher/watcher.go @@ -3,6 +3,7 @@ package watcher import ( "context" "fmt" + "log/slog" "os" "path/filepath" "strings" @@ -11,7 +12,7 @@ import ( "github.com/bmatcuk/doublestar/v4" "github.com/charmbracelet/crush/internal/config" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/lsp/protocol" "github.com/fsnotify/fsnotify" diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 1a43f86efc9fff264379d08c35fabf2a195a8d27..9983eb27765f5f5c916ec4bd75c4ffe56b053cd0 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -13,7 +13,7 @@ import ( "github.com/charmbracelet/crush/internal/diff" "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/history" - "log/slog" + "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/lsp/protocol" "github.com/charmbracelet/crush/internal/pubsub" @@ -94,7 +94,6 @@ func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case chat.SessionClearedMsg: m.session = session.Session{} case pubsub.Event[history.File]: - slog.Info("sidebar", "Received file history event", "file", msg.Payload.Path, "session", msg.Payload.SessionID) return m, m.handleFileHistoryEvent(msg) case pubsub.Event[session.Session]: if msg.Type == pubsub.UpdatedEvent { diff --git a/internal/tui/components/core/layout/split.go b/internal/tui/components/core/layout/split.go index 17622fb8d2c3545ea53890ee0487c198436c5e08..241a947d34e32f27a3bce4ad839e085e2b376b4c 100644 --- a/internal/tui/components/core/layout/split.go +++ b/internal/tui/components/core/layout/split.go @@ -1,9 +1,11 @@ package layout import ( + "log/slog" + "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "log/slog" + "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" diff --git a/internal/tui/components/core/status/status.go b/internal/tui/components/core/status/status.go index 4411ed517169509b714a007a77a0c917d769ecd9..aa481e60e64772471da7f094adb933db6fc933af 100644 --- a/internal/tui/components/core/status/status.go +++ b/internal/tui/components/core/status/status.go @@ -56,7 +56,6 @@ func (m *statusCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return m, m.clearMessageCmd(ttl) case util.ClearStatusMsg: m.info = util.InfoMsg{} - } return m, nil } diff --git a/main.go b/main.go index be1c9f94267b40727f22c5d513bd2c1defe517e1..7715d5e4f7023b48cf242dc5b559554a2a63be28 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log/slog" "net/http" "os" @@ -22,7 +23,7 @@ func main() { go func() { slog.Info("Serving pprof at localhost:6060") if httpErr := http.ListenAndServe("localhost:6060", nil); httpErr != nil { - slog.Error("Failed to pprof listen: %v", httpErr) + slog.Error(fmt.Sprintf("Failed to pprof listen: %v", httpErr)) } }() }