golang
diff --git a/‎gopls/internal/lsp/cache/analysis.go
+26-7 b/‎gopls/internal/lsp/cache/analysis.go
+26-7
diff --git a/‎gopls/internal/lsp/cache/cache.go
+2-111 b/‎gopls/internal/lsp/cache/cache.go
+2-111
@@ -11,6 +11,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/gob"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"go/ast"
@@ -1155,14 +1156,18 @@ func mustDecode(data []byte, ptr interface{}) {
 	}
 }
 
-// -- data types for serialization of analysis.Diagnostic --
+// -- data types for serialization of analysis.Diagnostic and source.Diagnostic --
 
 type gobDiagnostic struct {
 	Location       protocol.Location
-	Category       string
+	Severity       protocol.DiagnosticSeverity
+	Code           string
+	CodeHref       string
+	Source         string
 	Message        string
 	SuggestedFixes []gobSuggestedFix
 	Related        []gobRelatedInformation
+	Tags           []protocol.DiagnosticTag
 }
 
 type gobRelatedInformation struct {
@@ -1171,8 +1176,16 @@ type gobRelatedInformation struct {
 }
 
 type gobSuggestedFix struct {
-	Message   string
-	TextEdits []gobTextEdit
+	Message    string
+	TextEdits  []gobTextEdit
+	Command    *gobCommand
+	ActionKind protocol.CodeActionKind
+}
+
+type gobCommand struct {
+	Title     string
+	Command   string
+	Arguments []json.RawMessage
 }
 
 type gobTextEdit struct {
@@ -1218,11 +1231,17 @@ func toGobDiagnostic(posToLocation func(start, end token.Pos) (protocol.Location
 	if err != nil {
 		return gobDiagnostic{}, err
 	}
+
 	return gobDiagnostic{
-		Location:       loc,
-		Category:       diag.Category,
+		Location: loc,
+		// Severity for analysis diagnostics is dynamic, based on user
+		// configuration per analyzer.
+		// Code and CodeHref are unset for Analysis diagnostics,
+		// TODO(rfindley): set Code fields if/when golang/go#57906 is accepted.
+		Source:         diag.Category,
 		Message:        diag.Message,
-		Related:        related,
 		SuggestedFixes: fixes,
+		Related:        related,
+		// Analysis diagnostics do not contain tags.
 	}, nil
 }
@@ -6,13 +6,7 @@ package cache
 
 import (
 	"context"
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"html/template"
 	"reflect"
-	"sort"
 	"strconv"
 	"sync/atomic"
 
@@ -29,22 +23,15 @@ import (
 // Both the fset and store may be nil, but if store is non-nil so must be fset
 // (and they must always be used together), otherwise it may be possible to get
 // cached data referencing token.Pos values not mapped by the FileSet.
-func New(fset *token.FileSet, store *memoize.Store) *Cache {
+func New(store *memoize.Store) *Cache {
 	index := atomic.AddInt64(&cacheIndex, 1)
 
-	if store != nil && fset == nil {
-		panic("non-nil store with nil fset")
-	}
-	if fset == nil {
-		fset = token.NewFileSet()
-	}
 	if store == nil {
 		store = &memoize.Store{}
 	}
 
 	c := &Cache{
 		id:         strconv.FormatInt(index, 10),
-		fset:       fset,
 		store:      store,
 		memoizedFS: &memoizedFS{filesByID: map[robustio.FileID][]*DiskFile{}},
 	}
@@ -56,8 +43,7 @@ func New(fset *token.FileSet, store *memoize.Store) *Cache {
 // TODO(rfindley): once fset and store need not be bundled together, the Cache
 // type can be eliminated.
 type Cache struct {
-	id   string
-	fset *token.FileSet
+	id string
 
 	store *memoize.Store
 
@@ -90,98 +76,3 @@ var cacheIndex, sessionIndex, viewIndex int64
 
 func (c *Cache) ID() string                     { return c.id }
 func (c *Cache) MemStats() map[reflect.Type]int { return c.store.Stats() }
-
-type packageStat struct {
-	id        PackageID
-	mode      source.ParseMode
-	file      int64
-	ast       int64
-	types     int64
-	typesInfo int64
-	total     int64
-}
-
-func (c *Cache) PackageStats(withNames bool) template.HTML {
-	var packageStats []packageStat
-	c.store.DebugOnlyIterate(func(k, v interface{}) {
-		switch k.(type) {
-		case packageHandleKey:
-			v := v.(typeCheckResult)
-			if v.pkg == nil {
-				break
-			}
-			typsCost := typesCost(v.pkg.types.Scope())
-			typInfoCost := typesInfoCost(v.pkg.typesInfo)
-			stat := packageStat{
-				id:        v.pkg.id,
-				mode:      v.pkg.mode,
-				types:     typsCost,
-				typesInfo: typInfoCost,
-			}
-			for _, f := range v.pkg.compiledGoFiles {
-				stat.file += int64(len(f.Src))
-				stat.ast += astCost(f.File)
-			}
-			stat.total = stat.file + stat.ast + stat.types + stat.typesInfo
-			packageStats = append(packageStats, stat)
-		}
-	})
-	var totalCost int64
-	for _, stat := range packageStats {
-		totalCost += stat.total
-	}
-	sort.Slice(packageStats, func(i, j int) bool {
-		return packageStats[i].total > packageStats[j].total
-	})
-	html := "<table><thead><td>Name</td><td>total = file + ast + types + types info</td></thead>\n"
-	human := func(n int64) string {
-		return fmt.Sprintf("%.2f", float64(n)/(1024*1024))
-	}
-	var printedCost int64
-	for _, stat := range packageStats {
-		name := stat.id
-		if !withNames {
-			name = "-"
-		}
-		html += fmt.Sprintf("<tr><td>%v (%v)</td><td>%v = %v + %v + %v + %v</td></tr>\n", name, stat.mode,
-			human(stat.total), human(stat.file), human(stat.ast), human(stat.types), human(stat.typesInfo))
-		printedCost += stat.total
-		if float64(printedCost) > float64(totalCost)*.9 {
-			break
-		}
-	}
-	html += "</table>\n"
-	return template.HTML(html)
-}
-
-func astCost(f *ast.File) int64 {
-	if f == nil {
-		return 0
-	}
-	var count int64
-	ast.Inspect(f, func(_ ast.Node) bool {
-		count += 32 // nodes are pretty small.
-		return true
-	})
-	return count
-}
-
-func typesCost(scope *types.Scope) int64 {
-	cost := 64 + int64(scope.Len())*128 // types.object looks pretty big
-	for i := 0; i < scope.NumChildren(); i++ {
-		cost += typesCost(scope.Child(i))
-	}
-	return cost
-}
-
-func typesInfoCost(info *types.Info) int64 {
-	// Most of these refer to existing objects, with the exception of InitOrder, Selections, and Types.
-	cost := 24*len(info.Defs) +
-		32*len(info.Implicits) +
-		256*len(info.InitOrder) + // these are big, but there aren't many of them.
-		32*len(info.Scopes) +
-		128*len(info.Selections) + // wild guess
-		128*len(info.Types) + // wild guess
-		32*len(info.Uses)
-	return int64(cost)
-}