Skip to content

Commit 788e053

Browse files
committed
all: merge master (f29bdf1) into gopls-release-branch.0.7
Merge List: + 2022-01-14 f29bdf1 internal/lsp: add suggested fix for unusedparams analysis + 2022-01-14 7424a4d internal/lsp/cache: fix check for excluded paths in locateTemplateFiles + 2022-01-13 4e31bde internal/lsp/cache: avoid panic in mod diags with redundant requires + 2022-01-13 a222cdb gopls/internal/regtest: add regression tests for template diagnostics + 2022-01-13 c4cfc42 gopls: change the default value for templateExtensions to be empty + 2022-01-13 d34a02b internal/lsp/template: remove the skipTemplate guard + 2022-01-13 99c83b8 internal/lsp: find templates based on file kind + 2022-01-13 3f6aab1 internal/lsp: honor the file kind provided by clients for overlays + 2022-01-13 68b574a internal/template: identify template files by the templateExtensions option + 2022-01-11 d7a4bb4 internal/imports: avoid rare panic + 2022-01-11 0a91d41 internal/lsp/source: sort workspace symbol results for stability + 2022-01-11 eb07148 gopls: add string join/split postfix completions + 2022-01-11 52e9527 go/internal/gcimporter: set iexportVersionGenerics to 2 + 2022-01-10 f234b3d internal/lsp/source: keep collecting symbols on metadata errors + 2022-01-07 94bfe68 internal/lsp: don't get the snapshot asynchronously on config changes + 2022-01-07 351aaa6 internal/lsp/tests: re-enable MultiModule tests on plan9 + 2022-01-07 778a20b x/tools/gopls/internal/regtest/modfile: skip TestUnknownRevision and MultiModule tests on plan9 + 2022-01-06 a1300ed internal/lsp/tests: remove unnecessary uses of t.Helper + 2022-01-06 4754748 godoc: fix addNames for generics + 2022-01-06 d4d4325 gopls: remove obsoleted text from README + 2022-01-05 04daf88 templates: fix panic, and stop complaining about empty files + 2022-01-05 6606179 go/packages: add a clarification about the order of Syntax + 2022-01-04 15409b5 internal/lsp: foldable multiline strings + 2022-01-04 72cd390 x/tools: improving the error message for check fact type + 2021-12-28 ee1ca4f container/intsets: fix bug in UnionWith 'changed' result + 2021-12-28 2c49d4f container/intsets: use std math/bits routines + 2021-12-16 8d38310 gopls/doc: use improved code generator for API doc + 2021-12-15 c6ae451 gopls/doc: add some commentary on editor configuration for templates + 2021-12-15 cd2143c gopls/doc: update instructions for generics following the beta + 2021-12-09 27fc764 all: various test fixes related to any + 2021-12-09 e06c107 internal/lsp: normalize interface{} to any in test comparisons Change-Id: Ie534f8b21de86ca09b39e22afb4d7f4e32f0ea75
2 parents 2ef4e77 + f29bdf1 commit 788e053

File tree

89 files changed

+1243
-990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1243
-990
lines changed

cmd/guru/guru_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ func doQuery(out io.Writer, q *query, json bool) {
215215
}
216216

217217
for _, output := range outputs {
218+
// Replace occurrences of interface{} with any, for consistent output
219+
// across go 1.18 and earlier.
220+
output = strings.ReplaceAll(output, "interface{}", "any")
218221
fmt.Fprintf(out, "%s\n", output)
219222
}
220223

cmd/guru/testdata/src/implements/main.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface type FG
1313
implements F
1414

1515
-------- @implements slice --------
16-
slice type []int implements only interface{}
16+
slice type []int implements only any
1717

1818
-------- @implements C --------
1919
pointer type *C

cmd/guru/testdata/src/pointsto/main.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ this map[string]*int may point to these objects:
8181

8282
Error: pointer analysis wants an expression of reference type; got ()
8383
-------- @pointsto var-ref-s-f --------
84-
this interface{} may contain these dynamic types:
84+
this any may contain these dynamic types:
8585
chan bool, may point to:
8686
makechan
8787

cmd/guru/testdata/src/reflection/main.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ this reflect.Value may contain these dynamic types:
88
makemap
99

1010
-------- @pointsto p1 --------
11-
this interface{} may contain these dynamic types:
11+
this any may contain these dynamic types:
1212
*bool, may point to:
1313
reflection.b
1414
*int, may point to:

container/intsets/export_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright 2014 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package intsets
6+
7+
// Backdoor for testing.
8+
func (s *Sparse) Check() error { return s.check() }

container/intsets/popcnt_amd64.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

container/intsets/popcnt_amd64.s

Lines changed: 0 additions & 30 deletions
This file was deleted.

container/intsets/popcnt_gccgo.go

Lines changed: 0 additions & 10 deletions
This file was deleted.

container/intsets/popcnt_gccgo_c.c

Lines changed: 0 additions & 19 deletions
This file was deleted.

container/intsets/popcnt_generic.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)