From 27ba54a163d5005b6724563dea352e3446af1b87 Mon Sep 17 00:00:00 2001
From: Levi Neely <lneely@pascom.net>
Date: Wed, 19 Aug 2026 13:54:39 +0200
Subject: [PATCH] tools/lsp: move library code to internal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moves package lsp and cmdutil under tools/lsp/internal/ so the
multicall binary can live at tools/lsp/main.go — same layout as
codeintel and filetools.
---
 Makefile                                         | 2 +-
 tools/lsp/cmd/lsp_completion/main.go             | 2 +-
 tools/lsp/cmd/lsp_definition/main.go             | 4 ++--
 tools/lsp/cmd/lsp_diagnostics/main.go            | 4 ++--
 tools/lsp/cmd/lsp_hover/main.go                  | 2 +-
 tools/lsp/cmd/lsp_references/main.go             | 4 ++--
 tools/lsp/cmd/lsp_rename/main.go                 | 4 ++--
 tools/lsp/cmd/lsp_symbols/main.go                | 4 ++--
 tools/lsp/{ => internal}/cmdutil/cmdutil.go      | 2 +-
 tools/lsp/{ => internal}/cmdutil/cmdutil_test.go | 0
 tools/lsp/{ => internal/lsp}/adapter.go          | 0
 tools/lsp/{ => internal/lsp}/adapter_test.go     | 0
 tools/lsp/{ => internal/lsp}/bridge.go           | 0
 tools/lsp/{ => internal/lsp}/client.go           | 0
 tools/lsp/{ => internal/lsp}/doc.go              | 0
 tools/lsp/{ => internal/lsp}/server.go           | 0
 tools/lsp/{ => internal/lsp}/workspace.go        | 0
 tools/lsp/{cmd/lsptools => }/main.go             | 4 ++--
 18 files changed, 16 insertions(+), 16 deletions(-)
 rename tools/lsp/{ => internal}/cmdutil/cmdutil.go (98%)
 rename tools/lsp/{ => internal}/cmdutil/cmdutil_test.go (100%)
 rename tools/lsp/{ => internal/lsp}/adapter.go (100%)
 rename tools/lsp/{ => internal/lsp}/adapter_test.go (100%)
 rename tools/lsp/{ => internal/lsp}/bridge.go (100%)
 rename tools/lsp/{ => internal/lsp}/client.go (100%)
 rename tools/lsp/{ => internal/lsp}/doc.go (100%)
 rename tools/lsp/{ => internal/lsp}/server.go (100%)
 rename tools/lsp/{ => internal/lsp}/workspace.go (100%)
 rename tools/lsp/{cmd/lsptools => }/main.go (99%)

diff --git a/Makefile b/Makefile
index d54d6eb..bc36900 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ tools:
 	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/toolsrv ./cmd/toolsrv/
 	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/codeintel ./tools/codeintel/
 	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/filetools ./tools/filetools/
-	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/lsptools ./tools/lsp/cmd/lsptools/
+	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/lsptools ./tools/lsp/
 	go build -ldflags="-s -w" -o $(CONFIG_DIR)/tools/web_fetch ./tools/web/cmd/web_fetch/
 	cd $(CONFIG_DIR)/tools && for name in code_outline code_query code_rewrite code_symbols code_dependencies codebase_overview; do \
 		ln -sf codeintel $$name; \
diff --git a/tools/lsp/cmd/lsp_completion/main.go b/tools/lsp/cmd/lsp_completion/main.go
index c99add7..162dc61 100644
--- a/tools/lsp/cmd/lsp_completion/main.go
+++ b/tools/lsp/cmd/lsp_completion/main.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_definition/main.go b/tools/lsp/cmd/lsp_definition/main.go
index ac1c9bc..d9268bd 100644
--- a/tools/lsp/cmd/lsp_definition/main.go
+++ b/tools/lsp/cmd/lsp_definition/main.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_diagnostics/main.go b/tools/lsp/cmd/lsp_diagnostics/main.go
index b70aa4b..8be57fb 100644
--- a/tools/lsp/cmd/lsp_diagnostics/main.go
+++ b/tools/lsp/cmd/lsp_diagnostics/main.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_hover/main.go b/tools/lsp/cmd/lsp_hover/main.go
index 60ba190..f188f9d 100644
--- a/tools/lsp/cmd/lsp_hover/main.go
+++ b/tools/lsp/cmd/lsp_hover/main.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_references/main.go b/tools/lsp/cmd/lsp_references/main.go
index 704a569..da242e4 100644
--- a/tools/lsp/cmd/lsp_references/main.go
+++ b/tools/lsp/cmd/lsp_references/main.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_rename/main.go b/tools/lsp/cmd/lsp_rename/main.go
index cabf5f7..2e75c34 100644
--- a/tools/lsp/cmd/lsp_rename/main.go
+++ b/tools/lsp/cmd/lsp_rename/main.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmd/lsp_symbols/main.go b/tools/lsp/cmd/lsp_symbols/main.go
index 481182f..9a6a57f 100644
--- a/tools/lsp/cmd/lsp_symbols/main.go
+++ b/tools/lsp/cmd/lsp_symbols/main.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {
diff --git a/tools/lsp/cmdutil/cmdutil.go b/tools/lsp/internal/cmdutil/cmdutil.go
similarity index 98%
rename from tools/lsp/cmdutil/cmdutil.go
rename to tools/lsp/internal/cmdutil/cmdutil.go
index 0ce2c37..838471e 100644
--- a/tools/lsp/cmdutil/cmdutil.go
+++ b/tools/lsp/internal/cmdutil/cmdutil.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"ollie/tools/lsp"
+	"ollie/tools/lsp/internal/lsp"
 )
 
 // PositionArgs are the common args for position-based LSP commands.
diff --git a/tools/lsp/cmdutil/cmdutil_test.go b/tools/lsp/internal/cmdutil/cmdutil_test.go
similarity index 100%
rename from tools/lsp/cmdutil/cmdutil_test.go
rename to tools/lsp/internal/cmdutil/cmdutil_test.go
diff --git a/tools/lsp/adapter.go b/tools/lsp/internal/lsp/adapter.go
similarity index 100%
rename from tools/lsp/adapter.go
rename to tools/lsp/internal/lsp/adapter.go
diff --git a/tools/lsp/adapter_test.go b/tools/lsp/internal/lsp/adapter_test.go
similarity index 100%
rename from tools/lsp/adapter_test.go
rename to tools/lsp/internal/lsp/adapter_test.go
diff --git a/tools/lsp/bridge.go b/tools/lsp/internal/lsp/bridge.go
similarity index 100%
rename from tools/lsp/bridge.go
rename to tools/lsp/internal/lsp/bridge.go
diff --git a/tools/lsp/client.go b/tools/lsp/internal/lsp/client.go
similarity index 100%
rename from tools/lsp/client.go
rename to tools/lsp/internal/lsp/client.go
diff --git a/tools/lsp/doc.go b/tools/lsp/internal/lsp/doc.go
similarity index 100%
rename from tools/lsp/doc.go
rename to tools/lsp/internal/lsp/doc.go
diff --git a/tools/lsp/server.go b/tools/lsp/internal/lsp/server.go
similarity index 100%
rename from tools/lsp/server.go
rename to tools/lsp/internal/lsp/server.go
diff --git a/tools/lsp/workspace.go b/tools/lsp/internal/lsp/workspace.go
similarity index 100%
rename from tools/lsp/workspace.go
rename to tools/lsp/internal/lsp/workspace.go
diff --git a/tools/lsp/cmd/lsptools/main.go b/tools/lsp/main.go
similarity index 99%
rename from tools/lsp/cmd/lsptools/main.go
rename to tools/lsp/main.go
index be25809..edc6b62 100644
--- a/tools/lsp/cmd/lsptools/main.go
+++ b/tools/lsp/main.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"ollie/tools/lsp"
-	"ollie/tools/lsp/cmdutil"
+	"ollie/tools/lsp/internal/lsp"
+	"ollie/tools/lsp/internal/cmdutil"
 )
 
 func main() {