commit 3c3713e6a543fc1870ade379dd0acb6bcc3c0c24
author Alan Donovan <adonovan@google.com> Thu Nov 10 13:02:38 2022 -0500
committer Gopher Robot <gobot@golang.org> Fri Nov 11 03:59:42 2022 +0000
tree d09dc21d90f0bcd7f4becb9392ce22f970c130bd
parent 004d1181ca0c00605db348475f92ade5cfcded74

gopls/internal/lsp/cache: use typed strings (PackagePath et al) throughout

This changes uses the string types to enforce better hygiene
of conversions. Fishy conversions were flagged with TODO comments.
Perhaps some of these contribute to bugs in our support for vendoring.

Also, the function formerly known as ImportPath is now UnquoteImportPath.

Change-Id: Ia6bf8749908d881fb0a62cb6c98f7dd00563a69e
Reviewed-on: https://go-review.googlesource.com/c/tools/+/449497
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Alan Donovan <adonovan@google.com>
Run-TryBot: Alan Donovan <adonovan@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
Reviewed-by: Robert Findley <rfindley@google.com>

gopls/internal/lsp/cache/snapshot.go

diff --git a/gopls/internal/lsp/cache/snapshot.go b/gopls/internal/lsp/cache/snapshot.go
index d6599b1..f280304 100644
--- a/gopls/internal/lsp/cache/snapshot.go
+++ b/gopls/internal/lsp/cache/snapshot.go
@@ -811,17 +811,17 @@
 	return s.view.goversion >= 13 && s.view.Options().ExperimentalUseInvalidMetadata
 }
 
-func (s *snapshot) GetReverseDependencies(ctx context.Context, id string) ([]source.Package, error) {
+func (s *snapshot) GetReverseDependencies(ctx context.Context, id PackageID) ([]source.Package, error) {
 	if err := s.awaitLoaded(ctx); err != nil {
 		return nil, err
 	}
 	s.mu.Lock()
 	meta := s.meta
 	s.mu.Unlock()
-	ids := meta.reverseTransitiveClosure(s.useInvalidMetadata(), PackageID(id))
+	ids := meta.reverseTransitiveClosure(s.useInvalidMetadata(), id)
 
 	// Make sure to delete the original package ID from the map.
-	delete(ids, PackageID(id))
+	delete(ids, id)
 
 	var pkgs []source.Package
 	for id := range ids {
@@ -1212,12 +1212,11 @@
 	return meta, nil
 }
 
-func (s *snapshot) WorkspacePackageByID(ctx context.Context, id string) (source.Package, error) {
-	packageID := PackageID(id)
-	return s.checkedPackage(ctx, packageID, s.workspaceParseMode(packageID))
+func (s *snapshot) WorkspacePackageByID(ctx context.Context, id PackageID) (source.Package, error) {
+	return s.checkedPackage(ctx, id, s.workspaceParseMode(id))
 }
 
-func (s *snapshot) CachedImportPaths(ctx context.Context) (map[string]source.Package, error) {
+func (s *snapshot) CachedImportPaths(ctx context.Context) (map[PackagePath]source.Package, error) {
 	// Don't reload workspace package metadata.
 	// This function is meant to only return currently cached information.
 	s.AwaitInitialized(ctx)
@@ -1225,7 +1224,7 @@
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	results := map[string]source.Package{}
+	results := map[PackagePath]source.Package{}
 	s.packages.Range(func(_, v interface{}) {
 		cachedPkg, err := v.(*packageHandle).cached()
 		if err != nil {
@@ -1983,7 +1982,7 @@
 
 		// For metadata that has been newly invalidated, capture package paths
 		// requiring reloading in the shouldLoad map.
-		if invalidateMetadata && !source.IsCommandLineArguments(string(v.ID)) {
+		if invalidateMetadata && !source.IsCommandLineArguments(v.ID) {
 			if result.shouldLoad == nil {
 				result.shouldLoad = make(map[PackageID][]PackagePath)
 			}