From 96ace6c7019a914e21b25fa94ddfc4ee9239c2fb Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Mon, 18 Aug 2025 09:28:48 +0300
Subject: refactor(lsp,llm,hexailsp,appconfig): split long funcs; add tests

- Extract helpers to keep funcs <=50 lines; no behavior changes
- Add tests for prompt removal, code actions, and LLM request builders
- Table-drive TestInParamList; run gofmt
---
 internal/hexailsp/run.go | 94 ++++++++++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 39 deletions(-)

(limited to 'internal/hexailsp/run.go')

diff --git a/internal/hexailsp/run.go b/internal/hexailsp/run.go
index 1beb93a..64607e3 100644
--- a/internal/hexailsp/run.go
+++ b/internal/hexailsp/run.go
@@ -40,56 +40,72 @@ func Run(logPath string, stdin io.Reader, stdout io.Writer, stderr io.Writer) er
 // RunWithFactory is the testable entrypoint. When client is nil, it is built from cfg+env.
 // When factory is nil, lsp.NewServer is used.
 func RunWithFactory(logPath string, stdin io.Reader, stdout io.Writer, logger *log.Logger, cfg appconfig.App, client llm.Client, factory ServerFactory) error {
-	// Normalize and apply logging config
+	normalizeLoggingConfig(&cfg)
+	client = buildClientIfNil(cfg, client)
+	factory = ensureFactory(factory)
+
+	opts := makeServerOptions(cfg, strings.TrimSpace(logPath) != "", client)
+	server := factory(stdin, stdout, logger, opts)
+	if err := server.Run(); err != nil {
+		logger.Fatalf("server error: %v", err)
+	}
+	return nil
+}
+
+// --- helpers to keep RunWithFactory small ---
+
+func normalizeLoggingConfig(cfg *appconfig.App) {
 	cfg.ContextMode = strings.ToLower(strings.TrimSpace(cfg.ContextMode))
 	if cfg.LogPreviewLimit >= 0 {
 		logging.SetLogPreviewLimit(cfg.LogPreviewLimit)
 	}
+}
 
-	// Build LLM client if not provided
-	if client == nil {
-		llmCfg := llm.Config{
-			Provider:       cfg.Provider,
-			OpenAIBaseURL:  cfg.OpenAIBaseURL,
-			OpenAIModel:    cfg.OpenAIModel,
-			OpenAITemperature: cfg.OpenAITemperature,
-			OllamaBaseURL:  cfg.OllamaBaseURL,
-			OllamaModel:    cfg.OllamaModel,
-			OllamaTemperature: cfg.OllamaTemperature,
-			CopilotBaseURL: cfg.CopilotBaseURL,
-			CopilotModel:   cfg.CopilotModel,
-			CopilotTemperature: cfg.CopilotTemperature,
-		}
-		oaKey := os.Getenv("OPENAI_API_KEY")
-		cpKey := os.Getenv("COPILOT_API_KEY")
-		if c, err := llm.NewFromConfig(llmCfg, oaKey, cpKey); err != nil {
-			logging.Logf("lsp ", "llm disabled: %v", err)
-		} else {
-			client = c
-			logging.Logf("lsp ", "llm enabled provider=%s model=%s", c.Name(), c.DefaultModel())
-		}
+func buildClientIfNil(cfg appconfig.App, client llm.Client) llm.Client {
+	if client != nil {
+		return client
 	}
-
-	if factory == nil {
-		factory = func(r io.Reader, w io.Writer, logger *log.Logger, opts lsp.ServerOptions) ServerRunner {
-			return lsp.NewServer(r, w, logger, opts)
-		}
+	llmCfg := llm.Config{
+		Provider:           cfg.Provider,
+		OpenAIBaseURL:      cfg.OpenAIBaseURL,
+		OpenAIModel:        cfg.OpenAIModel,
+		OpenAITemperature:  cfg.OpenAITemperature,
+		OllamaBaseURL:      cfg.OllamaBaseURL,
+		OllamaModel:        cfg.OllamaModel,
+		OllamaTemperature:  cfg.OllamaTemperature,
+		CopilotBaseURL:     cfg.CopilotBaseURL,
+		CopilotModel:       cfg.CopilotModel,
+		CopilotTemperature: cfg.CopilotTemperature,
+	}
+	oaKey := os.Getenv("OPENAI_API_KEY")
+	cpKey := os.Getenv("COPILOT_API_KEY")
+	if c, err := llm.NewFromConfig(llmCfg, oaKey, cpKey); err != nil {
+		logging.Logf("lsp ", "llm disabled: %v", err)
+		return nil
+	} else {
+		logging.Logf("lsp ", "llm enabled provider=%s model=%s", c.Name(), c.DefaultModel())
+		return c
 	}
+}
 
-	server := factory(stdin, stdout, logger, lsp.ServerOptions{
-		LogContext:       strings.TrimSpace(logPath) != "",
-		MaxTokens:        cfg.MaxTokens,
-		ContextMode:      cfg.ContextMode,
-		WindowLines:      cfg.ContextWindowLines,
-		MaxContextTokens: cfg.MaxContextTokens,
+func ensureFactory(factory ServerFactory) ServerFactory {
+	if factory != nil {
+		return factory
+	}
+	return func(r io.Reader, w io.Writer, logger *log.Logger, opts lsp.ServerOptions) ServerRunner {
+		return lsp.NewServer(r, w, logger, opts)
+	}
+}
 
+func makeServerOptions(cfg appconfig.App, logContext bool, client llm.Client) lsp.ServerOptions {
+	return lsp.ServerOptions{
+		LogContext:        logContext,
+		MaxTokens:         cfg.MaxTokens,
+		ContextMode:       cfg.ContextMode,
+		WindowLines:       cfg.ContextWindowLines,
+		MaxContextTokens:  cfg.MaxContextTokens,
 		CodingTemperature: cfg.CodingTemperature,
-
 		Client:            client,
 		TriggerCharacters: cfg.TriggerCharacters,
-	})
-	if err := server.Run(); err != nil {
-		logger.Fatalf("server error: %v", err)
 	}
-	return nil
 }
-- 
cgit v1.2.3