internal/lsp/cache: use GetHandle not Bind for actions

This change uses a persistent.Map for actions, just like packages.
Actions are now reference counted rather than generational.

Also:
- note optimization opportunities.
- minor cleanups.

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

1 files changed, 18 insertions, 6 deletions

diff --git a/internal/lsp/cache/maps.go b/internal/lsp/cache/maps.go
index af0417771..f8e03057c 100644
--- a/internal/lsp/cache/maps.go
+++ b/internal/lsp/cache/maps.go
@@ -197,16 +197,18 @@ type packagesMap struct {
 func newPackagesMap() packagesMap {
 	return packagesMap{
 		impl: persistent.NewMap(func(a, b interface{}) bool {
-			left := a.(packageKey)
-			right := b.(packageKey)
-			if left.mode != right.mode {
-				return left.mode < right.mode
-			}
-			return left.id < right.id
+			return packageKeyLess(a.(packageKey), b.(packageKey))
 		}),
 	}
 }
 
+func packageKeyLess(x, y packageKey) bool {
+	if x.mode != y.mode {
+		return x.mode < y.mode
+	}
+	return x.id < y.id
+}
+
 func (m packagesMap) Clone() packagesMap {
 	return packagesMap{
 		impl: m.impl.Clone(),
@@ -285,3 +287,13 @@ func (s knownDirsSet) Insert(key span.URI) {
 func (s knownDirsSet) Remove(key span.URI) {
 	s.impl.Delete(key)
 }
+
+// actionKeyLessInterface is the less-than relation for actionKey
+// values wrapped in an interface.
+func actionKeyLessInterface(a, b interface{}) bool {
+	x, y := a.(actionKey), b.(actionKey)
+	if x.analyzer.Name != y.analyzer.Name {
+		return x.analyzer.Name < y.analyzer.Name
+	}
+	return packageKeyLess(x.pkg, y.pkg)
+}