cmd/go/internal/generate: call modload.InitWorkFile

matloob · matloob · commit b91bad78199a · 2024-01-29T19:39:24.000Z
This is necessary for go generate to enter workspace mode for recognizing package paths in the workspace. Fixes #56098 Change-Id: I25f68de24f4189259353f63194823516e9d3d505 Cq-Include-Trybots: luci.golang.try:gotip-linux-amd64-longtest,gotip-windows-amd64-longtest Reviewed-on: https://go-review.googlesource.com/c/go/+/559195 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Bryan Mills <bcmills@google.com>
diff --git a/src/cmd/go/internal/generate/generate.go b/src/cmd/go/internal/generate/generate.go
@@ -181,6 +181,8 @@ func init() {
 }
 
 func runGenerate(ctx context.Context, cmd *base.Command, args []string) {
+	modload.InitWorkfile()
+
 	if generateRunFlag != "" {
 		var err error
 		generateRunRE, err = regexp.Compile(generateRunFlag)
diff --git a/src/cmd/go/testdata/script/generate_workspace.txt b/src/cmd/go/testdata/script/generate_workspace.txt
@@ -0,0 +1,27 @@
+# This is a regression test for Issue #56098: Go generate
+# wasn't initializing workspace mode
+
+[short] skip
+
+go generate ./mod
+cmp ./mod/got.txt want.txt
+
+-- go.work --
+go 1.22
+
+use ./mod
+-- mod/go.mod --
+module example.com/mod
+-- mod/gen.go --
+//go:generate go run gen.go got.txt
+
+package main
+
+import "os"
+
+func main() {
+    outfile := os.Args[1]
+    os.WriteFile(outfile, []byte("Hello World!\n"), 0644)
+}
+-- want.txt --
+Hello World!

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,8 @@ func init() {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`func runGenerate(ctx context.Context, cmd *base.Command, args []string) {`
	`184`	`+ modload.InitWorkfile()`
	`185`	`+`
`184`	`186`	`if generateRunFlag != "" {`
`185`	`187`	`var err error`
`186`	`188`	`generateRunRE, err = regexp.Compile(generateRunFlag)`