diff --git a/.dprint.jsonc b/.dprint.jsonc
index e82b5073ec..6196f06cd4 100644
--- a/.dprint.jsonc
+++ b/.dprint.jsonc
@@ -39,9 +39,8 @@
     },
     "exec": {
         "cwd": "${configDir}",
-        "cacheKey": "4",
         "commands": [
-            { "command": "go tool mvdan.cc/gofumpt -lang=go1.25", "exts": ["go"] }
+            { "command": "go tool mvdan.cc/gofumpt", "exts": ["go"], "cacheKeyFiles": ["go.mod"] }
         ]
     },
     "excludes": [
@@ -59,9 +58,9 @@
     // Note: if adding new languages, make sure settings.template.json is updated too.
     // Also, if updating typescript, update the one in package.json.
     "plugins": [
-        "https://plugins.dprint.dev/typescript-0.95.9.wasm",
+        "https://plugins.dprint.dev/typescript-0.95.11.wasm",
         "https://plugins.dprint.dev/json-0.20.0.wasm",
         "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
-        "https://plugins.dprint.dev/exec-0.5.1.json@492414e39dea4dccc07b4af796d2f4efdb89e84bae2bd4e1e924c0cc050855bf"
+        "https://plugins.dprint.dev/exec-0.6.0.json@a054130d458f124f9b5c91484833828950723a5af3f8ff2bd1523bd47b83b364"
     ]
 }
diff --git a/NOTICE.txt b/NOTICE.txt
index 1aa3eedd36..c5bab5281f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -221,7 +221,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-github.com/go-json-experiment/json v0.0.0-20250811204210-4789234c3ea1 - BSD-3-Clause
+github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b - BSD-3-Clause
 
 
 Copyright 2010 The Go Authors
@@ -251,7 +251,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-golang.org/x/sync v0.16.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
+golang.org/x/sync v0.17.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 
 Copyright 2009 The Go Authors
@@ -266,7 +266,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 ---------------------------------------------------------
 
-golang.org/x/sys v0.35.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
+golang.org/x/sys v0.36.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 
 Copyright 2009 The Go Authors
@@ -294,7 +294,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 ---------------------------------------------------------
 
-golang.org/x/term v0.34.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
+golang.org/x/term v0.35.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 
 Copyright 2009 The Go Authors
@@ -309,7 +309,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 ---------------------------------------------------------
 
-golang.org/x/text v0.28.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
+golang.org/x/text v0.29.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
 
 
 (c) (c) A
diff --git a/_tools/go.mod b/_tools/go.mod
index 59eedc19e8..a594da84ae 100644
--- a/_tools/go.mod
+++ b/_tools/go.mod
@@ -4,7 +4,7 @@ go 1.25
 
 require (
 	github.com/golangci/plugin-module-register v0.1.2
-	golang.org/x/mod v0.27.0
+	golang.org/x/mod v0.28.0
 	golang.org/x/tools v0.36.0
 	gotest.tools/v3 v3.5.2
 )
diff --git a/_tools/go.sum b/_tools/go.sum
index b5fbda75e1..fcba38e676 100644
--- a/_tools/go.sum
+++ b/_tools/go.sum
@@ -2,8 +2,8 @@ github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3H
 github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
diff --git a/go.mod b/go.mod
index 3112ad9137..11f51956d5 100644
--- a/go.mod
+++ b/go.mod
@@ -4,23 +4,23 @@ go 1.25
 
 require (
 	github.com/dlclark/regexp2 v1.11.5
-	github.com/go-json-experiment/json v0.0.0-20250811204210-4789234c3ea1
+	github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
 	github.com/google/go-cmp v0.7.0
 	github.com/peter-evans/patience v0.3.0
 	github.com/zeebo/xxh3 v1.0.2
-	golang.org/x/sync v0.16.0
-	golang.org/x/sys v0.35.0
-	golang.org/x/term v0.34.0
-	golang.org/x/text v0.28.0
+	golang.org/x/sync v0.17.0
+	golang.org/x/sys v0.36.0
+	golang.org/x/term v0.35.0
+	golang.org/x/text v0.29.0
 	gotest.tools/v3 v3.5.2
 )
 
 require (
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/matryer/moq v0.5.3 // indirect
-	golang.org/x/mod v0.26.0 // indirect
-	golang.org/x/tools v0.35.0 // indirect
-	mvdan.cc/gofumpt v0.8.0 // indirect
+	github.com/matryer/moq v0.6.0 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
+	mvdan.cc/gofumpt v0.9.1 // indirect
 )
 
 tool (
diff --git a/go.sum b/go.sum
index 6072ec9433..90c9c62d6a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/go-json-experiment/json v0.0.0-20250811204210-4789234c3ea1 h1:KaJSg7Eaxs50Tw1m9QeR4Ua/If27AltydVhyZ184HEI=
-github.com/go-json-experiment/json v0.0.0-20250811204210-4789234c3ea1/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
+github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
+github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -12,8 +12,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matryer/moq v0.5.3 h1:4femQCFmBUwFPYs8VfM5ID7AI67/DTEDRBbTtSWy7GU=
-github.com/matryer/moq v0.5.3/go.mod h1:8288Qkw7gMZhUP3cIN86GG7g5p9jRuZH8biXLW4RXvQ=
+github.com/matryer/moq v0.6.0 h1:FCccG09c3o4cg3gnrZ+7ty5Pa/sjmN24BMHp/0pwhjQ=
+github.com/matryer/moq v0.6.0/go.mod h1:iEVhY/XBwFG/nbRyEf0oV+SqnTHZJ5wectzx7yT+y98=
 github.com/peter-evans/patience v0.3.0 h1:rX0JdJeepqdQl1Sk9c9uvorjYYzL2TfgLX1adqYm9cA=
 github.com/peter-evans/patience v0.3.0/go.mod h1:Kmxu5sY1NmBLFSStvXjX1wS9mIv7wMcP/ubucyMOAu0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -24,19 +24,19 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
+golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
-mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k=
-mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg=
+mvdan.cc/gofumpt v0.9.1 h1:p5YT2NfFWsYyTieYgwcQ8aKV3xRvFH4uuN/zB2gBbMQ=
+mvdan.cc/gofumpt v0.9.1/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw=
diff --git a/internal/api/server.go b/internal/api/server.go
index 694f6dfec1..5a3ce4213b 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -22,7 +22,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.25 -w stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w stringer_generated.go
 
 type MessageType uint8
 
diff --git a/internal/ast/kind.go b/internal/ast/kind.go
index 4afc42eec0..9f6bc22720 100644
--- a/internal/ast/kind.go
+++ b/internal/ast/kind.go
@@ -1,7 +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.25 -w kind_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w kind_stringer_generated.go
 
 type Kind int16
 
diff --git a/internal/ast/utilities.go b/internal/ast/utilities.go
index 199b547521..be31ac3541 100644
--- a/internal/ast/utilities.go
+++ b/internal/ast/utilities.go
@@ -2672,7 +2672,7 @@ func findImportOrRequire(text string, start int) (index int, size int) {
 			expected = "require"
 		}
 		if index+size <= n && text[index:index+size] == expected {
-			return
+			return index, size
 		}
 		index++
 	}
diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 5db40b6f9f..bddf6670d2 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -19452,7 +19452,7 @@ func (c *Checker) checkAndAggregateYieldOperandTypes(fn *ast.Node, checkMode Che
 			nextTypes = core.AppendIfUnique(nextTypes, nextType)
 		}
 	})
-	return
+	return yieldTypes, nextTypes
 }
 
 func (c *Checker) createPromiseType(promisedType *Type) *Type {
diff --git a/internal/checker/types.go b/internal/checker/types.go
index 87bf3b49a1..5fd4b15830 100644
--- a/internal/checker/types.go
+++ b/internal/checker/types.go
@@ -10,7 +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.25 -w stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w stringer_generated.go
 
 // ParseFlags
 
diff --git a/internal/collections/syncmap.go b/internal/collections/syncmap.go
index 35c81978b6..67162585e4 100644
--- a/internal/collections/syncmap.go
+++ b/internal/collections/syncmap.go
@@ -14,7 +14,7 @@ type SyncMap[K comparable, V any] struct {
 func (s *SyncMap[K, V]) Load(key K) (value V, ok bool) {
 	val, ok := s.m.Load(key)
 	if !ok {
-		return
+		return value, ok
 	}
 	return val.(V), true
 }
diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go
index 7da3fba394..4850faa83b 100644
--- a/internal/core/compileroptions.go
+++ b/internal/core/compileroptions.go
@@ -11,7 +11,7 @@ import (
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=ModuleKind -trimprefix=ModuleKind -output=modulekind_stringer_generated.go
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=ScriptTarget -trimprefix=ScriptTarget -output=scripttarget_stringer_generated.go
-//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w modulekind_stringer_generated.go scripttarget_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w modulekind_stringer_generated.go scripttarget_stringer_generated.go
 
 type CompilerOptions struct {
 	_ noCopy
diff --git a/internal/core/languagevariant.go b/internal/core/languagevariant.go
index 1f7065f3cb..e5ad990cac 100644
--- a/internal/core/languagevariant.go
+++ b/internal/core/languagevariant.go
@@ -1,7 +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.25 -w languagevariant_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w languagevariant_stringer_generated.go
 
 type LanguageVariant int32
 
diff --git a/internal/core/scriptkind.go b/internal/core/scriptkind.go
index ed9d3ba34f..aa6152812f 100644
--- a/internal/core/scriptkind.go
+++ b/internal/core/scriptkind.go
@@ -1,7 +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.25 -w scriptkind_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w scriptkind_stringer_generated.go
 
 type ScriptKind int32
 
diff --git a/internal/core/tristate.go b/internal/core/tristate.go
index 32778103fa..34841b7513 100644
--- a/internal/core/tristate.go
+++ b/internal/core/tristate.go
@@ -1,7 +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.25 -w tristate_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w tristate_stringer_generated.go
 
 // Tristate
 
diff --git a/internal/diagnostics/diagnostics.go b/internal/diagnostics/diagnostics.go
index ce9c0b8fed..df6e05de49 100644
--- a/internal/diagnostics/diagnostics.go
+++ b/internal/diagnostics/diagnostics.go
@@ -5,7 +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.25 -w diagnostics_generated.go stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w diagnostics_generated.go stringer_generated.go
 
 type Category int32
 
diff --git a/internal/ls/autoimportstypes.go b/internal/ls/autoimportstypes.go
index aeb9ddf543..3ac6ba6417 100644
--- a/internal/ls/autoimportstypes.go
+++ b/internal/ls/autoimportstypes.go
@@ -11,7 +11,7 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=ExportKind -output=autoImports_stringer_generated.go
-//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w autoImports_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w autoImports_stringer_generated.go
 
 type ImportKind int
 
diff --git a/internal/project/project.go b/internal/project/project.go
index 17689ce507..6354e0ab30 100644
--- a/internal/project/project.go
+++ b/internal/project/project.go
@@ -23,7 +23,7 @@ const (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Kind -trimprefix=Kind -output=project_stringer_generated.go
-//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w project_stringer_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w project_stringer_generated.go
 
 type Kind int
 
diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
index fdad013ef1..ede9405f83 100644
--- a/internal/scanner/scanner.go
+++ b/internal/scanner/scanner.go
@@ -2432,7 +2432,7 @@ func GetLineAndCharacterOfPosition(sourceFile ast.SourceFileLike, pos int) (line
 	lineMap := GetLineStarts(sourceFile)
 	line = ComputeLineOfPosition(lineMap, pos)
 	character = utf8.RuneCountInString(sourceFile.Text()[lineMap[line]:pos])
-	return
+	return line, character
 }
 
 func GetEndLinePosition(sourceFile *ast.SourceFile, line int) int {
diff --git a/internal/testutil/projecttestutil/projecttestutil.go b/internal/testutil/projecttestutil/projecttestutil.go
index 55b2a66073..169709d42c 100644
--- a/internal/testutil/projecttestutil/projecttestutil.go
+++ b/internal/testutil/projecttestutil/projecttestutil.go
@@ -19,10 +19,10 @@ 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.25 -w clientmock_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w clientmock_generated.go
 
 //go:generate go tool github.com/matryer/moq -stub -fmt goimports -pkg projecttestutil -out npmexecutormock_generated.go ../../project/ata NpmExecutor
-//go:generate go tool mvdan.cc/gofumpt -lang=go1.24 -w npmexecutormock_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w npmexecutormock_generated.go
 
 const (
 	TestTypingsLocation = "/home/src/Library/Caches/typescript"
diff --git a/internal/transformers/moduletransforms/commonjsmodule.go b/internal/transformers/moduletransforms/commonjsmodule.go
index 5d7c18e295..8f39ecdd78 100644
--- a/internal/transformers/moduletransforms/commonjsmodule.go
+++ b/internal/transformers/moduletransforms/commonjsmodule.go
@@ -51,7 +51,7 @@ func (tx *CommonJSModuleTransformer) pushNode(node *ast.Node) (grandparentNode *
 	grandparentNode = tx.parentNode
 	tx.parentNode = tx.currentNode
 	tx.currentNode = node
-	return
+	return grandparentNode
 }
 
 // Pops the last child node off the ancestor tracking stack, restoring the grandparent node.
diff --git a/internal/transformers/tstransforms/runtimesyntax.go b/internal/transformers/tstransforms/runtimesyntax.go
index 7e61b5ea4a..dd8e6e189a 100644
--- a/internal/transformers/tstransforms/runtimesyntax.go
+++ b/internal/transformers/tstransforms/runtimesyntax.go
@@ -44,7 +44,7 @@ func (tx *RuntimeSyntaxTransformer) pushNode(node *ast.Node) (grandparentNode *a
 	grandparentNode = tx.parentNode
 	tx.parentNode = tx.currentNode
 	tx.currentNode = node
-	return
+	return grandparentNode
 }
 
 // Pops the last child node off the ancestor tracking stack, restoring the grandparent node.
diff --git a/internal/transformers/tstransforms/typeeraser.go b/internal/transformers/tstransforms/typeeraser.go
index 6026c2190e..aa132669a4 100644
--- a/internal/transformers/tstransforms/typeeraser.go
+++ b/internal/transformers/tstransforms/typeeraser.go
@@ -25,7 +25,7 @@ func (tx *TypeEraserTransformer) pushNode(node *ast.Node) (grandparentNode *ast.
 	grandparentNode = tx.parentNode
 	tx.parentNode = tx.currentNode
 	tx.currentNode = node
-	return
+	return grandparentNode
 }
 
 // Pops the last child node off the ancestor tracking stack, restoring the grandparent node.
diff --git a/internal/vfs/vfs.go b/internal/vfs/vfs.go
index f50309b4d4..559fe47965 100644
--- a/internal/vfs/vfs.go
+++ b/internal/vfs/vfs.go
@@ -6,7 +6,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.25 -w vfsmock/mock_generated.go
+//go:generate go tool mvdan.cc/gofumpt -w vfsmock/mock_generated.go
 
 // FS is a file system abstraction.
 type FS interface {