Skip to content

Commit 77e0312

Browse files
committed
[gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6
0e232fa gopls: add scheme to CodeDescription.href 2363391 all: go fmt ./... b369640 all: fmt tests with new gofmt f6e0443 go/analysis: add unusedwrite pass bdaa8bf go/gcexportdata: warn that {Read,Write}Bundle are experimental f4301d9 internal/imports: update stdlib index for 1.16 f3748ed internal/lsp/source: filter out comparable from completion results f47cb78 go/analysis/passes/buildtag: update check for //go:build 06713c2 go/loader: fix race 1f00549 internal/regtest: fix regtests for the dev.typeparams Go branch 4b19790 txtar: minor fix in unit test input 9eb3535 internal/lsp: 'go get' packages instead of modules 67e49ef go/internal/cgo: set pkgdir with -srcdir instead of CWD 19ff21f go/analysis/unitchecker: tell the user how to list the flags and analyzers d5b8332 internal/lsp/command: rename package generate to gen 4534fc3 go/internal/gcimporter: reference golang/go#44339 in TODO 35839b7 go/internal/gcimporter: fix tests on darwin a1db63c go/internal/gcimporter: add "bundled" export data formats b79f76f go/internal/gcimporter: fix reexporting compiler data 7fde01f go/internal/gcimporter: refactor IExportData tests 6055ccf go/internal/gcimporter: simplify IExportData API 1e7abac internal/lsp: refactor go command error handling ffc2075 internal/lsp: fix nil pointer in hover when (types.Object).Pkg() is nil fca8992 internal/lsp: handle nil pointer with import shortcut = link 5848b84 internal/typesinternal: sync error codes with go1.16 3a5a051 go/analysis/passes: add sigchanyzer Analyzer Change-Id: I1d4a41669e2f8e8115fb5d62cc25a62f7c755ba2
2 parents 1ee389b + 0e232fa commit 77e0312

File tree

149 files changed

+1901
-629
lines changed

Some content is hidden

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

149 files changed

+1901
-629
lines changed

cmd/bundle/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ func bundle(src, dst, dstpkg, prefix, buildTags string) ([]byte, error) {
228228

229229
var out bytes.Buffer
230230
if buildTags != "" {
231+
fmt.Fprintf(&out, "//go:build %s\n", buildTags)
231232
fmt.Fprintf(&out, "// +build %s\n\n", buildTags)
232233
}
233234

cmd/bundle/testdata/out.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build tag
12
// +build tag
23

34
// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.

cmd/callgraph/main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
// No testdata on Android.
66

7-
// +build !android
8-
// +build go1.11
7+
//go:build !android && go1.11
8+
// +build !android,go1.11
99

1010
package main
1111

cmd/cover/cover_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// No testdata on Android.
66

7+
//go:build !android
78
// +build !android
89

910
package main_test

cmd/fiximports/main_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// No testdata on Android.
66

7+
//go:build !android
78
// +build !android
89

910
package main

cmd/getgo/download.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build !plan9
56
// +build !plan9
67

78
package main

cmd/getgo/download_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build !plan9
56
// +build !plan9
67

78
package main

cmd/getgo/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build !plan9
56
// +build !plan9
67

78
// The getgo command installs Go to the user's system.

cmd/getgo/main_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build !plan9
56
// +build !plan9
67

78
package main

cmd/getgo/path.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5+
//go:build !plan9
56
// +build !plan9
67

78
package main

0 commit comments

Comments
 (0)