[gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6

6375436 Revert "[gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6"
0af0626 internal/lsp: save all possible keys for analyses, codelenses
ee6d6af internal/lsp: restructure user options (CL 278433 continued)
2152f4e Merge "[gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6"
4a19ffb gopls/internal/regtest: await file changes in TestUseGoplsMod
481d425 [gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6
ef3185b internal/lsp/cache: add a check for snapshot invariants
b841374 internal/lsp: fix autocomplete appends on imports
929a849 internal/lsp: restructure the way we report critical errors
fbbba25 gopls/doc: generate documentation for analyzers
84d76fe internal/lsp: fix unimported completions with -mod=readonly
0661ca7 gopls/internal/regtest: show line numbers if TestUseGoplsMod fails
13ff221 internal/lsp/cmd: include new name in rename help message
0f6027f gopls/doc/vim.md: add table of contents, improve neovim docs
34cd474 internal/lsp: use an enum for GC annotations settings
b1c9089 internal/lsp/source: do not panic in "var func" outgoing callhierarchy
2b0845d gopls/release: add a command to validate the gopls release process
57089f8 internal/lsp: remove dependencies using text edits when necessary
834755c internal/lsp: add tests to set configuration options
bdbb3c9 internal/lsp/cache: only reload the workspace on saved changes
3e0a2b7 gopls/internal/regtest: skip a some new builders where regtests time out
f6952e4 internal/lsp/cache: fix some package event tags
9cbb1ef internal/lsp/source: add the shadow analyzer
3fa0e8f gopls: disable TestTemplate on Android
f2e330f gopls/test: add type checking for debug server templates
1965356 internal/lsp/mod: fix misplaced code lens with individual requires
b57d1c5 internal/lsp: return an error if code action has no title
ae774e9 internal/lsp: don't show duplicate diagnostics for go.mod errors
5b06639 internal/lsp/source: only show "run file benchmarks" if available
11a5667 gopls/internal/regtest: test metadata validation only on save for go.mod
5b43ef9 go/analysis/passes/fieldalignment: filter comments from suggested fix
4b31ac3 gopls/internal/regtest: test that accepting fix removes diagnostics
008e477 internal/lsp, gopls: recover from go-diff panics
48e5bd1 internal/lsp: add titles to `go mod tidy` and update go.sum fixes
fa10ef0 internal/lsp/source: update codelenses example
6307297 go/analysis/passes/fieldalignment: support fields without name

Change-Id: Ic66860e1eea3ce41e818011ec00b41a77cbd3345

Author: stamblerre

go/analysis/analysistest/analysistest.go

@@ -195,7 +195,10 @@ func RunWithSuggestedFixes(t Testing, dir string, a *analysis.Analyzer, patterns
 								continue
 							}
 							if want != string(formatted) {
-								d := myers.ComputeEdits("", want, string(formatted))
+								d, err := myers.ComputeEdits("", want, string(formatted))
+								if err != nil {
+									t.Errorf("failed to compute suggested fixes: %v", err)
+								}
 								t.Errorf("suggested fixes failed for %s:\n%s", file.Name(), diff.ToUnified(fmt.Sprintf("%s.golden [%s]", file.Name(), sf), "actual", want, d))
 							}
 							break
@@ -221,7 +224,10 @@ func RunWithSuggestedFixes(t Testing, dir string, a *analysis.Analyzer, patterns
 					continue
 				}
 				if want != string(formatted) {
-					d := myers.ComputeEdits("", want, string(formatted))
+					d, err := myers.ComputeEdits("", want, string(formatted))
+					if err != nil {
+						t.Errorf("failed to compute edits: %s", err)
+					}
 					t.Errorf("suggested fixes failed for %s:\n%s", file.Name(), diff.ToUnified(file.Name()+".golden", "actual", want, d))
 				}
 			}

go/analysis/passes/fieldalignment/fieldalignment.go

@@ -76,7 +76,10 @@ func fieldalignment(pass *analysis.Pass, node *ast.StructType, typ *types.Struct
 	// TODO: Preserve multi-named fields instead of flattening.
 	var flat []*ast.Field
 	for _, f := range node.Fields.List {
-		if len(f.Names) == 1 {
+		// TODO: Preserve comment, for now get rid of them.
+		//       See https://github.com/golang/go/issues/20744
+		f.Comment = nil
+		if len(f.Names) <= 1 {
 			flat = append(flat, f)
 			continue
 		}

go/analysis/passes/fieldalignment/testdata/src/a/a.go

@@ -21,3 +21,17 @@ type ZeroBad struct { // want "struct of size 8 could be 4"
 	a uint32
 	b [0]byte
 }
+
+type NoNameGood struct {
+	Good
+	y int32
+	x byte
+	z byte
+}
+
+type NoNameBad struct { // want "struct of size 20 could be 16"
+	Good
+	x byte
+	y int32
+	z byte
+}

go/analysis/passes/fieldalignment/testdata/src/a/a.go.golden

@@ -21,3 +21,17 @@ type ZeroBad struct {
 	b [0]byte
 	a uint32
 }
+
+type NoNameGood struct {
+	Good
+	y int32
+	x byte
+	z byte
+}
+
+type NoNameBad struct {
+	Good
+	y int32
+	x byte
+	z byte
+}

go/analysis/passes/fieldalignment/testdata/src/a/a_amd64.go

@@ -38,3 +38,11 @@ type MultiField struct { // want "struct of size 40 could be 24"
 	a3     [3]bool
 	_      [0]func()
 }
+
+type Issue43233 struct { // want "struct with 88 pointer bytes could be 80"
+	AllowedEvents []*string // allowed events
+	BlockedEvents []*string // blocked events
+	APIVersion    string    `mapstructure:"api_version"`
+	BaseURL       string    `mapstructure:"base_url"`
+	AccessToken   string    `mapstructure:"access_token"`
+}

go/analysis/passes/fieldalignment/testdata/src/a/a_amd64.go.golden

@@ -39,3 +39,11 @@ type MultiField struct {
 	a3 [3]bool
 	b  bool
 }
+
+type Issue43233 struct {
+	APIVersion    string `mapstructure:"api_version"`
+	BaseURL       string `mapstructure:"base_url"`
+	AccessToken   string `mapstructure:"access_token"`
+	AllowedEvents []*string
+	BlockedEvents []*string
+}