Format all generated files (#1073)

Author: jakebailey

.dprint.jsonc

@@ -50,7 +50,6 @@
         "**/*-lock.json",
         "**/testdata",
         "_submodules/**",
-        "**/*_generated.go",
         "internal/bundled/libs/**",
         "internal/lsp/lsproto/_generate/*.json",
         "internal/lsp/lsproto/_generate/metaModelSchema.mts",

internal/api/server.go

@@ -18,6 +18,7 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=MessageType -output=stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w stringer_generated.go
 
 type MessageType uint8
 

internal/ast/kind.go

@@ -1,6 +1,7 @@
 package ast
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Kind -output=kind_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w kind_stringer_generated.go
 
 type Kind int16
 

internal/checker/types.go

@@ -10,6 +10,7 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=SignatureKind -output=stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w stringer_generated.go
 
 // ParseFlags
 

internal/core/compileroptions.go

@@ -8,6 +8,7 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=ModuleKind,ScriptTarget -output=compileroptions_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w compileroptions_stringer_generated.go
 
 type CompilerOptions struct {
 	AllowJs                                   Tristate                                  `json:"allowJs,omitzero"`

internal/core/compileroptions_stringer_generated.go

@@ -1,6 +1,7 @@
 package core
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=LanguageVariant -output=languagevariant_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w languagevariant_stringer_generated.go
 
 type LanguageVariant int32
 

internal/core/languagevariant.go

@@ -1,6 +1,7 @@
 package core
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=ScriptKind -output=scriptkind_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w scriptkind_stringer_generated.go
 
 type ScriptKind int32
 

internal/core/scriptkind.go

@@ -1,6 +1,7 @@
 package core
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Tristate -output=tristate_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w tristate_stringer_generated.go
 
 // Tristate
 

internal/core/tristate.go

@@ -5,6 +5,7 @@ import "github.com/microsoft/typescript-go/internal/stringutil"
 
 //go:generate go run generate.go -output ./diagnostics_generated.go
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Category -output=stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w diagnostics_generated.go stringer_generated.go
 
 type Category int32
 

internal/diagnostics/diagnostics.go

@@ -88,7 +88,7 @@ func main() {
 			buf.WriteString(`, reportsDeprecated: true`)
 		}
 
-		buf.WriteString("}\n")
+		buf.WriteString("}\n\n")
 	}
 
 	formatted, err := format.Source(buf.Bytes())

internal/diagnostics/diagnostics_generated.go

@@ -634,8 +634,8 @@ function main() {
         fs.writeFileSync(out, generatedCode);
 
         // Format with gofmt
-        const gofmt = which.sync("gofmt");
-        cp.execFileSync(gofmt, ["-w", out]);
+        const gofmt = which.sync("go");
+        cp.execFileSync(gofmt, ["tool", "mvdan.cc/gofumpt", "-lang=go1.24", "-w", out]);
 
         console.log(`Successfully generated ${out}`);
     }

internal/diagnostics/generate.go

@@ -23,6 +23,8 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Kind -output=project_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w project_stringer_generated.go
+
 const hr = "-----------------------------------------------"
 
 var projectNamer = &namer{}

internal/lsp/lsproto/_generate/generate.mjs

@@ -19,6 +19,7 @@ import (
 )
 
 //go:generate go tool github.com/matryer/moq -stub -fmt goimports -pkg projecttestutil -out clientmock_generated.go ../../project Client
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w clientmock_generated.go
 
 type TestTypingsInstallerOptions struct {
 	TypesRegistry         []string

internal/lsp/lsproto/lsp_generated.go

@@ -5,6 +5,7 @@ import (
 )
 
 //go:generate go tool github.com/matryer/moq -fmt goimports -out vfsmock/mock_generated.go -pkg vfsmock . FS
+//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w vfsmock/mock_generated.go
 
 // FS is a file system abstraction.
 type FS interface {