all: fmt tests with new gofmt

rsc · rsc · commit b369640312a9 · 2021-02-20T03:28:42.000Z
Part of //go:build change (#41184). See https://golang.org/design/draft-gobuild The Go 1.17 gofmt will insert the extra //go:build lines. The older gofmts will not remove them. Get ahead of the game by adding them now. (Keeps x/tools tests passing on go repo trybots.) Change-Id: Ifdb4af93f6cc38a9aa616516e923384b7312e991 Reviewed-on: https://go-review.googlesource.com/c/tools/+/294413 gopls-CI: kokoro <noreply+kokoro@google.com> Reviewed-by: Robert Griesemer <gri@golang.org> Trust: Robert Griesemer <gri@golang.org> Trust: Russ Cox <rsc@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Run-TryBot: Russ Cox <rsc@golang.org>
diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
@@ -228,6 +228,7 @@ func bundle(src, dst, dstpkg, prefix, buildTags string) ([]byte, error) {
 
 	var out bytes.Buffer
 	if buildTags != "" {
+		fmt.Fprintf(&out, "//go:build %s\n", buildTags)
 		fmt.Fprintf(&out, "// +build %s\n\n", buildTags)
 	}
 
diff --git a/cmd/bundle/testdata/out.golden b/cmd/bundle/testdata/out.golden
@@ -1,3 +1,4 @@
+//go:build tag
 // +build tag
 
 // Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.
diff --git a/internal/lsp/command/command_gen.go b/internal/lsp/command/command_gen.go
diff --git a/internal/lsp/command/gen/gen.go b/internal/lsp/command/gen/gen.go
diff --git a/internal/lsp/command/generate.go b/internal/lsp/command/generate.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
@@ -11,11 +12,11 @@ import (
 	"io/ioutil"
 	"os"
 
-	"golang.org/x/tools/internal/lsp/command/generate"
+	"golang.org/x/tools/internal/lsp/command/gen"
 )
 
 func main() {
-	content, err := generate.Generate()
+	content, err := gen.Generate()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
diff --git a/refactor/eg/testdata/A.template b/refactor/eg/testdata/A.template
@@ -1,5 +1,3 @@
-// +build ignore
-
 package template
 
 // Basic test of type-aware expression refactoring.
diff --git a/refactor/eg/testdata/A1.go b/refactor/eg/testdata/A1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package A1
 
 import (
diff --git a/refactor/eg/testdata/A1.golden b/refactor/eg/testdata/A1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package A1
 
 import (
diff --git a/refactor/eg/testdata/A2.go b/refactor/eg/testdata/A2.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package A2
 
 // This refactoring causes addition of "errors" import.
diff --git a/refactor/eg/testdata/A2.golden b/refactor/eg/testdata/A2.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package A2
 
 // This refactoring causes addition of "errors" import.
diff --git a/refactor/eg/testdata/B1.go b/refactor/eg/testdata/B1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package B1
 
 import "time"
diff --git a/refactor/eg/testdata/B1.golden b/refactor/eg/testdata/B1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package B1
 
 import "time"
diff --git a/refactor/eg/testdata/C1.go b/refactor/eg/testdata/C1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package C1
 
 import "strings"
diff --git a/refactor/eg/testdata/C1.golden b/refactor/eg/testdata/C1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package C1
 
 import "strings"
diff --git a/refactor/eg/testdata/D1.go b/refactor/eg/testdata/D1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package D1
 
 import "fmt"
diff --git a/refactor/eg/testdata/D1.golden b/refactor/eg/testdata/D1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package D1
 
 import "fmt"
diff --git a/refactor/eg/testdata/E1.go b/refactor/eg/testdata/E1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package E1
 
 import "log"
diff --git a/refactor/eg/testdata/E1.golden b/refactor/eg/testdata/E1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package E1
 
 import (
diff --git a/refactor/eg/testdata/F.template b/refactor/eg/testdata/F.template
@@ -1,8 +1,8 @@
 package templates
 
-// Test 
+// Test
 
 import "sync"
 
 func before(s sync.RWMutex) { s.Lock() }
-func after(s sync.RWMutex) { s.RLock() }
+func after(s sync.RWMutex)  { s.RLock() }
diff --git a/refactor/eg/testdata/F1.go b/refactor/eg/testdata/F1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package F1
 
 import "sync"
diff --git a/refactor/eg/testdata/F1.golden b/refactor/eg/testdata/F1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package F1
 
 import "sync"
diff --git a/refactor/eg/testdata/G.template b/refactor/eg/testdata/G.template
@@ -7,4 +7,3 @@ import (
 
 func before(from, to token.Pos) ast.BadExpr { return ast.BadExpr{From: from, To: to} }
 func after(from, to token.Pos) ast.BadExpr  { return ast.BadExpr{from, to} }
-     
diff --git a/refactor/eg/testdata/G1.go b/refactor/eg/testdata/G1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package G1
 
 import "go/ast"
diff --git a/refactor/eg/testdata/G1.golden b/refactor/eg/testdata/G1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package G1
 
 import "go/ast"
diff --git a/refactor/eg/testdata/H1.go b/refactor/eg/testdata/H1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package H1
 
 import "go/ast"
diff --git a/refactor/eg/testdata/H1.golden b/refactor/eg/testdata/H1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package H1
 
 import "go/ast"
diff --git a/refactor/eg/testdata/I.template b/refactor/eg/testdata/I.template
@@ -1,5 +1,3 @@
-// +build ignore
-
 package templates
 
 import (
diff --git a/refactor/eg/testdata/I1.go b/refactor/eg/testdata/I1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package I1
 
 import "fmt"
diff --git a/refactor/eg/testdata/I1.golden b/refactor/eg/testdata/I1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package I1
 
 import (
diff --git a/refactor/eg/testdata/J.template b/refactor/eg/testdata/J.template
@@ -1,5 +1,3 @@
-// +build ignore
-
 package templates
 
 import ()
diff --git a/refactor/eg/testdata/J1.go b/refactor/eg/testdata/J1.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package I1
 
 import "fmt"
diff --git a/refactor/eg/testdata/J1.golden b/refactor/eg/testdata/J1.golden
@@ -1,5 +1,3 @@
-// +build ignore
-
 package I1
 
 import "fmt"

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,7 @@ func bundle(src, dst, dstpkg, prefix, buildTags string) ([]byte, error) {`
`228`	`228`
`229`	`229`	`var out bytes.Buffer`
`230`	`230`	`if buildTags != "" {`
	`231`	`+ fmt.Fprintf(&out, "//go:build %s\n", buildTags)`
`231`	`232`	`fmt.Fprintf(&out, "// +build %s\n\n", buildTags)`
`232`	`233`	`}`
`233`	`234`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build tag`
`1`	`2`	`// +build tag`
`2`	`3`
`3`	`4`	`// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build ignore`
`2`		`-`
`3`	`1`	`package template`
`4`	`2`
`5`	`3`	`// Basic test of type-aware expression refactoring.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build ignore`
`2`		`-`
`3`	`1`	`package A1`
`4`	`2`
`5`	`3`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build ignore`
`2`		`-`
`3`	`1`	`package A2`
`4`	`2`
`5`	`3`	`// This refactoring causes addition of "errors" import.`