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/completion_state.go | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'internal/lsp/completion_state.go') diff --git a/internal/lsp/completion_state.go b/internal/lsp/completion_state.go index 5c2716f..04bab58 100644 --- a/internal/lsp/completion_state.go +++ b/internal/lsp/completion_state.go @@ -141,31 +141,3 @@ func (s *completionState) waitForThrottle(ctx context.Context, interval time.Dur return true } } - -func (s *Server) storePendingCompletion(key string, items []CompletionItem) { - s.completionState.storePendingCompletion(key, items) -} - -func (s *Server) setCompletionsDisabled(disabled bool) bool { - return s.completionState.setCompletionsDisabled(disabled) -} - -func (s *Server) completionDisabled() bool { - return s.completionState.completionDisabled() -} - -func (s *Server) takePendingCompletion(key string) []CompletionItem { - return s.completionState.takePendingCompletion(key) -} - -func (s *Server) completionCacheGet(key string) (string, bool) { - return s.completionState.cacheGet(key) -} - -func (s *Server) completionCachePut(key, value string) { - s.completionState.cachePut(key, value) -} - -func (s *Server) waitForThrottle(ctx context.Context) bool { - return s.completionState.waitForThrottle(ctx, s.completionThrottle()) -} -- cgit v1.2.3