From 236f6543b093e54157f40ec0c021b35177e1713e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 11 Jun 2026 00:16:27 +0300 Subject: Refactor lsp.Server God Object: extract chat and completion subsystems The Server type accumulated two large, tangled feature subsystems (in-editor chat and code completion) alongside its core LSP dispatch role. Pull them into cohesive types that own their state and logic while delegating shared infrastructure back to Server via a back-reference. - Add completionService (completion_service.go): owns the completion cache/throttle state (completionState) and all completion request-handling logic (handleCompletion, plan/jobs/execute, provider-native path, post-processing, message building, prefix heuristics). Methods moved off Server in handlers_completion.go to completionService. - Add chatService (chat_service.go + chat_handlers.go): owns the input-activity clock (lastInput, with its own mutex instead of Server.mu) and all in-editor chat logic (detection, transcript history, message building, edit application, inline prompts) plus the slash-command handlers (chat_commands.go). - Server now holds chat/completion fields, wires them in NewServer, and delegates (dispatch table, didChange, debounce gate) to them. Thin Server shims preserve the existing completion-state API for callers/tests. Pure refactor: no behavior or LSP protocol changes. Tests adjusted only to reach the relocated methods/state via the services. All tests pass with -race; coverage 86.1%. Co-Authored-By: Claude Opus 4.8 --- internal/lsp/chat_commands_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/lsp/chat_commands_test.go') diff --git a/internal/lsp/chat_commands_test.go b/internal/lsp/chat_commands_test.go index ffe31dd..15a3acf 100644 --- a/internal/lsp/chat_commands_test.go +++ b/internal/lsp/chat_commands_test.go @@ -28,7 +28,7 @@ func TestFormatReloadSummary(t *testing.T) { func TestHandleHelpCommandListsReload(t *testing.T) { s := newTestServer() - res := s.handleHelpCommand() + res := s.chatSvc().handleHelpCommand() if !strings.Contains(res.message, "/reload?>") { t.Fatalf("expected reload command in help output: %q", res.message) } @@ -70,7 +70,7 @@ func TestHandleReloadCommandReloadsStore(t *testing.T) { t.Fatalf("update config: %v", err) } - res := s.handleReloadCommand() + res := s.chatSvc().handleReloadCommand() if !strings.Contains(res.message, "Reloaded config (1 changes):") { t.Fatalf("unexpected reload summary: %q", res.message) } @@ -115,7 +115,7 @@ func TestDetectAndHandleChatExecutesSlashCommand(t *testing.T) { uri := "file:///cmd.go" s.setDocument(uri, "/reload>\n") - s.detectAndHandleChat(uri) + s.chatSvc().detectAndHandleChat(uri) outStr := out.String() if !strings.Contains(outStr, "Reloaded config") { @@ -132,7 +132,7 @@ func TestDisableEnableCommandsToggleCompletions(t *testing.T) { t.Fatalf("expected completions enabled initially") } - if res, ok := s.chatCommandResponse("file:///x", 0, "/disable>"); !ok { + if res, ok := s.chatSvc().chatCommandResponse("file:///x", 0, "/disable>"); !ok { t.Fatalf("expected disable command to be handled") } else if !strings.Contains(res.message, "disabled") { t.Fatalf("unexpected disable message: %q", res.message) @@ -141,13 +141,13 @@ func TestDisableEnableCommandsToggleCompletions(t *testing.T) { t.Fatalf("expected completions disabled after command") } - if res, ok := s.chatCommandResponse("file:///x", 0, "/disable>"); !ok { + if res, ok := s.chatSvc().chatCommandResponse("file:///x", 0, "/disable>"); !ok { t.Fatalf("expected repeated disable command to be handled") } else if !strings.Contains(res.message, "already disabled") { t.Fatalf("expected already-disabled message, got %q", res.message) } - if res, ok := s.chatCommandResponse("file:///x", 0, "/enable>"); !ok { + if res, ok := s.chatSvc().chatCommandResponse("file:///x", 0, "/enable>"); !ok { t.Fatalf("expected enable command to be handled") } else if !strings.Contains(res.message, "enabled") { t.Fatalf("unexpected enable message: %q", res.message) @@ -156,7 +156,7 @@ func TestDisableEnableCommandsToggleCompletions(t *testing.T) { t.Fatalf("expected completions enabled after command") } - if res, ok := s.chatCommandResponse("file:///x", 0, "/enable>"); !ok { + if res, ok := s.chatSvc().chatCommandResponse("file:///x", 0, "/enable>"); !ok { t.Fatalf("expected repeated enable command to be handled") } else if !strings.Contains(res.message, "already enabled") { t.Fatalf("expected already-enabled message, got %q", res.message) -- cgit v1.2.3