gopls/internal/cache: move out of lsp/

Change-Id: Id65551f45428860cef3a72d43f0e219e428a8455 Reviewed-on: https://go-review.googlesource.com/c/tools/+/557718 Auto-Submit: Alan Donovan <adonovan@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Robert Findley <rfindley@google.com>
golang · Jan 24, 2024 · f872b3d · f872b3d
1 parent 6823da4
commit f872b3d
Show file tree

Hide file tree

Showing 133 changed files with 159 additions and 159 deletions.
diff --git a/gopls/doc/design/implementation.md b/gopls/doc/design/implementation.md
@@ -145,7 +145,7 @@ access to server functionality. These subcommands are primarily
 provided as a debugging aid (but see
 [#63693](https://github.com/golang/go/issues/63693)).
 
-[cache]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache
+[cache]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache
 [cmd]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cmd
 [command]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/command
 [debug]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/debug
@@ -158,16 +158,16 @@ provided as a debugging aid (but see
 [lsp]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp
 [lsprpc]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsprpc
 [memoize]: https://github.com/golang/tools/tree/master/internal/memoize
-[metadata]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/metadata
-[methodsets]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/methodsets
+[metadata]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/metadata
+[methodsets]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/methodsets
 [mod]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/mod
-[parsego]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/parsego
+[parsego]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/parsego
 [protocol]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/protocol
 [server]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/server
 [settings]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/settings
 [source]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/source
 [template]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/template
-[typerefs]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/typerefs
+[typerefs]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/typerefs
 [work]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/work
 [x/tools]: https://github.com/golang/tools@master
-[xrefs]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/lsp/cache/xrefs
+[xrefs]: https://pkg.go.dev/golang.org/x/tools/gopls@master/internal/cache/xrefs
diff --git a/gopls/internal/lsp/cache/analysis.go → gopls/internal/cache/analysis.go b/gopls/internal/lsp/cache/analysis.go → gopls/internal/cache/analysis.go
@@ -34,7 +34,7 @@ import (
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/gopls/internal/file"
 	"golang.org/x/tools/gopls/internal/filecache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/progress"
 	"golang.org/x/tools/gopls/internal/settings"
@@ -150,7 +150,7 @@ import (
 //   Even if the ultimate consumer decides to ignore errors,
 //   tests and other situations want to be assured of freedom from
 //   errors, not just missing results. This should be recorded.
-// - Split this into a subpackage, gopls/internal/lsp/cache/driver,
+// - Split this into a subpackage, gopls/internal/cache/driver,
 //   consisting of this file and three helpers from errors.go.
 //   The (*snapshot).Analyze method would stay behind and make calls
 //   to the driver package.

diff --git a/gopls/internal/lsp/cache/cache.go → gopls/internal/cache/cache.go b/gopls/internal/lsp/cache/cache.go → gopls/internal/cache/cache.go
diff --git a/gopls/internal/lsp/cache/check.go → gopls/internal/cache/check.go b/gopls/internal/lsp/cache/check.go → gopls/internal/cache/check.go
@@ -24,8 +24,8 @@ import (
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/gopls/internal/file"
 	"golang.org/x/tools/gopls/internal/filecache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/gopls/internal/util/safetoken"

diff --git a/gopls/internal/lsp/cache/constraints.go → gopls/internal/cache/constraints.go b/gopls/internal/lsp/cache/constraints.go → gopls/internal/cache/constraints.go
diff --git a/gopls/internal/lsp/cache/constraints_test.go → gopls/internal/cache/constraints_test.go b/gopls/internal/lsp/cache/constraints_test.go → gopls/internal/cache/constraints_test.go
diff --git a/gopls/internal/lsp/cache/debug.go → gopls/internal/cache/debug.go b/gopls/internal/lsp/cache/debug.go → gopls/internal/cache/debug.go
diff --git a/gopls/internal/lsp/cache/diagnostics.go → gopls/internal/cache/diagnostics.go b/gopls/internal/lsp/cache/diagnostics.go → gopls/internal/cache/diagnostics.go
diff --git a/gopls/internal/lsp/cache/errors.go → gopls/internal/cache/errors.go b/gopls/internal/lsp/cache/errors.go → gopls/internal/cache/errors.go
@@ -22,7 +22,7 @@ import (
 
 	"golang.org/x/tools/go/packages"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"

diff --git a/gopls/internal/lsp/cache/errors_test.go → gopls/internal/cache/errors_test.go b/gopls/internal/lsp/cache/errors_test.go → gopls/internal/cache/errors_test.go
diff --git a/gopls/internal/lsp/cache/filemap.go → gopls/internal/cache/filemap.go b/gopls/internal/lsp/cache/filemap.go → gopls/internal/cache/filemap.go
diff --git a/gopls/internal/lsp/cache/filemap_test.go → gopls/internal/cache/filemap_test.go b/gopls/internal/lsp/cache/filemap_test.go → gopls/internal/cache/filemap_test.go
diff --git a/gopls/internal/lsp/cache/filterer.go → gopls/internal/cache/filterer.go b/gopls/internal/lsp/cache/filterer.go → gopls/internal/cache/filterer.go
diff --git a/gopls/internal/lsp/cache/fs_memoized.go → gopls/internal/cache/fs_memoized.go b/gopls/internal/lsp/cache/fs_memoized.go → gopls/internal/cache/fs_memoized.go
diff --git a/gopls/internal/lsp/cache/fs_overlay.go → gopls/internal/cache/fs_overlay.go b/gopls/internal/lsp/cache/fs_overlay.go → gopls/internal/cache/fs_overlay.go
diff --git a/gopls/internal/lsp/cache/imports.go → gopls/internal/cache/imports.go b/gopls/internal/lsp/cache/imports.go → gopls/internal/cache/imports.go
diff --git a/gopls/internal/lsp/cache/keys.go → gopls/internal/cache/keys.go b/gopls/internal/lsp/cache/keys.go → gopls/internal/cache/keys.go
diff --git a/gopls/internal/lsp/cache/load.go → gopls/internal/cache/load.go b/gopls/internal/lsp/cache/load.go → gopls/internal/cache/load.go
@@ -17,7 +17,7 @@ import (
 
 	"golang.org/x/tools/go/packages"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/gopls/internal/util/immutable"

diff --git a/...internal/lsp/cache/metadata/cycle_test.go → gopls/internal/cache/metadata/cycle_test.go b/...internal/lsp/cache/metadata/cycle_test.go → gopls/internal/cache/metadata/cycle_test.go
diff --git a/gopls/internal/lsp/cache/metadata/graph.go → gopls/internal/cache/metadata/graph.go b/gopls/internal/lsp/cache/metadata/graph.go → gopls/internal/cache/metadata/graph.go
diff --git a/...s/internal/lsp/cache/metadata/metadata.go → gopls/internal/cache/metadata/metadata.go b/...s/internal/lsp/cache/metadata/metadata.go → gopls/internal/cache/metadata/metadata.go
diff --git a/...ternal/lsp/cache/methodsets/methodsets.go → ...s/internal/cache/methodsets/methodsets.go b/...ternal/lsp/cache/methodsets/methodsets.go → ...s/internal/cache/methodsets/methodsets.go
diff --git a/gopls/internal/lsp/cache/mod.go → gopls/internal/cache/mod.go b/gopls/internal/lsp/cache/mod.go → gopls/internal/cache/mod.go
diff --git a/gopls/internal/lsp/cache/mod_tidy.go → gopls/internal/cache/mod_tidy.go b/gopls/internal/lsp/cache/mod_tidy.go → gopls/internal/cache/mod_tidy.go
diff --git a/gopls/internal/lsp/cache/mod_vuln.go → gopls/internal/cache/mod_vuln.go b/gopls/internal/lsp/cache/mod_vuln.go → gopls/internal/cache/mod_vuln.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/mod/semver"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/tools/go/packages"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/vulncheck"
 	"golang.org/x/tools/gopls/internal/vulncheck/govulncheck"

diff --git a/gopls/internal/lsp/cache/os_darwin.go → gopls/internal/cache/os_darwin.go b/gopls/internal/lsp/cache/os_darwin.go → gopls/internal/cache/os_darwin.go
diff --git a/gopls/internal/lsp/cache/os_windows.go → gopls/internal/cache/os_windows.go b/gopls/internal/lsp/cache/os_windows.go → gopls/internal/cache/os_windows.go
diff --git a/gopls/internal/lsp/cache/parse.go → gopls/internal/cache/parse.go b/gopls/internal/lsp/cache/parse.go → gopls/internal/cache/parse.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 )
 
 // ParseGo parses the file whose contents are provided by fh.

diff --git a/gopls/internal/lsp/cache/parse_cache.go → gopls/internal/cache/parse_cache.go b/gopls/internal/lsp/cache/parse_cache.go → gopls/internal/cache/parse_cache.go
@@ -18,7 +18,7 @@ import (
 
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/internal/memoize"
 	"golang.org/x/tools/internal/tokeninternal"

diff --git a/gopls/internal/lsp/cache/parse_cache_test.go → gopls/internal/cache/parse_cache_test.go b/gopls/internal/lsp/cache/parse_cache_test.go → gopls/internal/cache/parse_cache_test.go
diff --git a/gopls/internal/lsp/cache/parsego/file.go → gopls/internal/cache/parsego/file.go b/gopls/internal/lsp/cache/parsego/file.go → gopls/internal/cache/parsego/file.go
diff --git a/gopls/internal/lsp/cache/parsego/parse.go → gopls/internal/cache/parsego/parse.go b/gopls/internal/lsp/cache/parsego/parse.go → gopls/internal/cache/parsego/parse.go
diff --git a/.../internal/lsp/cache/parsego/parse_test.go → gopls/internal/cache/parsego/parse_test.go b/.../internal/lsp/cache/parsego/parse_test.go → gopls/internal/cache/parsego/parse_test.go
@@ -10,7 +10,7 @@ import (
 	"go/token"
 	"testing"
 
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/util/safetoken"
 	"golang.org/x/tools/internal/tokeninternal"
 )

diff --git a/gopls/internal/lsp/cache/pkg.go → gopls/internal/cache/pkg.go b/gopls/internal/lsp/cache/pkg.go → gopls/internal/cache/pkg.go
@@ -12,10 +12,10 @@ import (
 	"go/types"
 	"sync"
 
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/methodsets"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
-	"golang.org/x/tools/gopls/internal/lsp/cache/xrefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/methodsets"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/xrefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 )
 

diff --git a/gopls/internal/lsp/cache/port.go → gopls/internal/cache/port.go b/gopls/internal/lsp/cache/port.go → gopls/internal/cache/port.go
diff --git a/gopls/internal/lsp/cache/port_test.go → gopls/internal/cache/port_test.go b/gopls/internal/lsp/cache/port_test.go → gopls/internal/cache/port_test.go
diff --git a/gopls/internal/lsp/cache/session.go → gopls/internal/cache/session.go b/gopls/internal/lsp/cache/session.go → gopls/internal/cache/session.go
@@ -18,8 +18,8 @@ import (
 	"time"
 
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/gopls/internal/util/persistent"

diff --git a/gopls/internal/lsp/cache/session_test.go → gopls/internal/cache/session_test.go b/gopls/internal/lsp/cache/session_test.go → gopls/internal/cache/session_test.go
diff --git a/gopls/internal/lsp/cache/snapshot.go → gopls/internal/cache/snapshot.go b/gopls/internal/lsp/cache/snapshot.go → gopls/internal/cache/snapshot.go
@@ -30,10 +30,10 @@ import (
 	"golang.org/x/tools/go/types/objectpath"
 	"golang.org/x/tools/gopls/internal/file"
 	"golang.org/x/tools/gopls/internal/filecache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/methodsets"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
-	"golang.org/x/tools/gopls/internal/lsp/cache/xrefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/methodsets"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/xrefs"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"

diff --git a/gopls/internal/lsp/cache/symbols.go → gopls/internal/cache/symbols.go b/gopls/internal/lsp/cache/symbols.go → gopls/internal/cache/symbols.go
diff --git a/gopls/internal/lsp/cache/typerefs/doc.go → gopls/internal/cache/typerefs/doc.go b/gopls/internal/lsp/cache/typerefs/doc.go → gopls/internal/cache/typerefs/doc.go
@@ -111,7 +111,7 @@
 // The [BuildPackageGraph] constructor implements a whole-graph analysis similar
 // to that which will be implemented by gopls, but for various reasons the
 // logic for this analysis will eventually live in the
-// [golang.org/x/tools/gopls/internal/lsp/cache] package. Nevertheless,
+// [golang.org/x/tools/gopls/internal/cache] package. Nevertheless,
 // BuildPackageGraph and its test serve to verify the syntactic analysis, and
 // may serve as a proving ground for new optimizations of the whole-graph analysis.
 //

diff --git a/...internal/lsp/cache/typerefs/packageset.go → gopls/internal/cache/typerefs/packageset.go b/...internal/lsp/cache/typerefs/packageset.go → gopls/internal/cache/typerefs/packageset.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"sync"
 
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 )
 
 // PackageIndex stores common data to enable efficient representation of

diff --git a/...ernal/lsp/cache/typerefs/pkggraph_test.go → .../internal/cache/typerefs/pkggraph_test.go b/...ernal/lsp/cache/typerefs/pkggraph_test.go → .../internal/cache/typerefs/pkggraph_test.go
@@ -17,9 +17,9 @@ import (
 	"sync"
 
 	"golang.org/x/sync/errgroup"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 )
 

diff --git a/...ternal/lsp/cache/typerefs/pkgrefs_test.go → ...s/internal/cache/typerefs/pkgrefs_test.go b/...ternal/lsp/cache/typerefs/pkgrefs_test.go → ...s/internal/cache/typerefs/pkgrefs_test.go
@@ -20,9 +20,9 @@ import (
 
 	"golang.org/x/tools/go/gcexportdata"
 	"golang.org/x/tools/go/packages"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/astutil"
 	"golang.org/x/tools/internal/packagesinternal"
@@ -327,7 +327,7 @@ func (s mapMetadataSource) Metadata(id PackageID) *Metadata {
 }
 
 // This function is a compressed version of snapshot.load from the
-// internal/lsp/cache package, for use in testing.
+// internal/cache package, for use in testing.
 //
 // TODO(rfindley): it may be valuable to extract this logic from the snapshot,
 // since it is otherwise standalone.
@@ -386,7 +386,7 @@ func loadPackages(query string, needExport bool) (map[PackageID]string, Metadata
 		for importPath, imported := range pkg.Imports {
 			importPath := ImportPath(importPath)
 
-			// see note in gopls/internal/lsp/cache/load.go for an explanation of this check.
+			// see note in gopls/internal/cache/load.go for an explanation of this check.
 			if importPath != "unsafe" && len(imported.CompiledGoFiles) == 0 {
 				mp.DepsByImpPath[importPath] = "" // missing
 				continue

diff --git a/gopls/internal/lsp/cache/typerefs/refs.go → gopls/internal/cache/typerefs/refs.go b/gopls/internal/lsp/cache/typerefs/refs.go → gopls/internal/cache/typerefs/refs.go
@@ -11,8 +11,8 @@ import (
 	"sort"
 	"strings"
 
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/util/astutil"
 	"golang.org/x/tools/gopls/internal/util/frob"
 )

diff --git a/.../internal/lsp/cache/typerefs/refs_test.go → gopls/internal/cache/typerefs/refs_test.go b/.../internal/lsp/cache/typerefs/refs_test.go → gopls/internal/cache/typerefs/refs_test.go
@@ -12,9 +12,9 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
-	"golang.org/x/tools/gopls/internal/lsp/cache/typerefs"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/typerefs"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 )
 

diff --git a/gopls/internal/lsp/cache/view.go → gopls/internal/cache/view.go b/gopls/internal/lsp/cache/view.go → gopls/internal/cache/view.go
@@ -28,7 +28,7 @@ import (
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/semver"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"
 	"golang.org/x/tools/gopls/internal/util/maps"

diff --git a/gopls/internal/lsp/cache/view_test.go → gopls/internal/cache/view_test.go b/gopls/internal/lsp/cache/view_test.go → gopls/internal/cache/view_test.go
diff --git a/gopls/internal/lsp/cache/workspace.go → gopls/internal/cache/workspace.go b/gopls/internal/lsp/cache/workspace.go → gopls/internal/cache/workspace.go
diff --git a/gopls/internal/lsp/cache/xrefs/xrefs.go → gopls/internal/cache/xrefs/xrefs.go b/gopls/internal/lsp/cache/xrefs/xrefs.go → gopls/internal/cache/xrefs/xrefs.go
@@ -14,8 +14,8 @@ import (
 	"sort"
 
 	"golang.org/x/tools/go/types/objectpath"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/frob"
 	"golang.org/x/tools/gopls/internal/util/typesutil"

diff --git a/gopls/internal/cmd/capabilities_test.go b/gopls/internal/cmd/capabilities_test.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"golang.org/x/tools/gopls/internal/lsp/cache"
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/server"
 	"golang.org/x/tools/gopls/internal/settings"

diff --git a/gopls/internal/cmd/cmd.go b/gopls/internal/cmd/cmd.go
@@ -21,9 +21,9 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/debug"
 	"golang.org/x/tools/gopls/internal/filecache"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/lsprpc"

diff --git a/gopls/internal/cmd/serve.go b/gopls/internal/cmd/serve.go
@@ -14,8 +14,8 @@ import (
 	"os"
 	"time"
 
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/debug"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/lsprpc"
 	"golang.org/x/tools/gopls/internal/telemetry"

diff --git a/gopls/internal/debug/serve.go b/gopls/internal/debug/serve.go
@@ -24,8 +24,8 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/debug/log"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/internal/event"

diff --git a/gopls/internal/debug/template_test.go b/gopls/internal/debug/template_test.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/jba/templatecheck"
 	"golang.org/x/tools/go/packages"
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/debug"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/internal/testenv"
 )
 

diff --git a/gopls/internal/filecache/filecache.go b/gopls/internal/filecache/filecache.go
@@ -266,7 +266,7 @@ func SetBudget(new int64) (old int64) {
 // The current design instead exploits a trick from the cache
 // implementation used by the go command: writes of small files are in
 // practice atomic (all or nothing) on all platforms.
-// (See GOROOT/src/cmd/go/internal/lsp/cache/cache.go.)
+// (See GOROOT/src/cmd/go/internal/cache/cache.go.)
 //
 // Russ Cox notes: "all file systems use an rwlock around every file
 // system block, including data blocks, so any writes or reads within

diff --git a/gopls/internal/golang/add_import.go b/gopls/internal/golang/add_import.go
@@ -7,8 +7,8 @@ package golang
 import (
 	"context"
 
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/internal/imports"
 )

diff --git a/gopls/internal/golang/call_hierarchy.go b/gopls/internal/golang/call_hierarchy.go
@@ -15,7 +15,7 @@ import (
 
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/gopls/internal/util/safetoken"

diff --git a/gopls/internal/golang/change_signature.go b/gopls/internal/golang/change_signature.go
@@ -17,8 +17,8 @@ import (
 
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/bug"
 	"golang.org/x/tools/gopls/internal/util/safetoken"

diff --git a/gopls/internal/golang/code_lens.go b/gopls/internal/golang/code_lens.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 )

diff --git a/gopls/internal/golang/codeaction.go b/gopls/internal/golang/codeaction.go
@@ -14,8 +14,8 @@ import (
 	"golang.org/x/tools/go/ast/inspector"
 	"golang.org/x/tools/gopls/internal/analysis/fillstruct"
 	"golang.org/x/tools/gopls/internal/file"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/parsego"
+	"golang.org/x/tools/gopls/internal/cache"
+	"golang.org/x/tools/gopls/internal/cache/parsego"
 	"golang.org/x/tools/gopls/internal/lsp/command"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"

diff --git a/gopls/internal/golang/completion/completion.go b/gopls/internal/golang/completion/completion.go
@@ -30,8 +30,8 @@ import (
 	"golang.org/x/tools/gopls/internal/file"
 	"golang.org/x/tools/gopls/internal/golang"
 	"golang.org/x/tools/gopls/internal/golang/completion/snippet"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/settings"
 	goplsastutil "golang.org/x/tools/gopls/internal/util/astutil"

diff --git a/gopls/internal/golang/completion/package.go b/gopls/internal/golang/completion/package.go
@@ -20,7 +20,7 @@ import (
 
 	"golang.org/x/tools/gopls/internal/file"
 	"golang.org/x/tools/gopls/internal/golang"
-	"golang.org/x/tools/gopls/internal/lsp/cache"
+	"golang.org/x/tools/gopls/internal/cache"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/safetoken"
 	"golang.org/x/tools/internal/fuzzy"

diff --git a/gopls/internal/golang/completion/postfix_snippets.go b/gopls/internal/golang/completion/postfix_snippets.go
@@ -18,7 +18,7 @@ import (
 
 	"golang.org/x/tools/gopls/internal/golang"
 	"golang.org/x/tools/gopls/internal/golang/completion/snippet"
-	"golang.org/x/tools/gopls/internal/lsp/cache/metadata"
+	"golang.org/x/tools/gopls/internal/cache/metadata"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
 	"golang.org/x/tools/gopls/internal/util/safetoken"
 	"golang.org/x/tools/internal/event"