Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dprint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"cwd": "${configDir}",
"cacheKey": "4",
"commands": [
{ "command": "go tool mvdan.cc/gofumpt -lang=go1.24", "exts": ["go"] }
{ "command": "go tool mvdan.cc/gofumpt -lang=go1.25", "exts": ["go"] }
]
},
"excludes": [
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Setup Go
inputs:
go-version:
description: Go version range to set up.
default: '>=1.24.0'
default: '>=1.25.0'
create:
description: Create the cache
default: 'false'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
- uses: ./.github/actions/setup-go
with:
# Updated to 1.25.0-rc.1 to improve compilation time
go-version: '>=1.25.0-rc.1'
lint-cache: 'true'
- run: npm i -g @playwright/[email protected]
- run: npm ci
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/create-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ jobs:
- windows-latest
- macos-latest
go-version:
- '>=1.24.0'

include:
# Temporary for the Copilot setup steps
- os: ubuntu-latest
go-version: '>=1.25.0-rc.1'
- '>=1.25.0'

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To use this, set this in your VS Code settings:

## How to Build and Run

This repo uses [Go 1.24 or higher](https://go.dev/dl/), [Rust 1.85 or higher](https://www.rust-lang.org/tools/install), [Node.js with npm](https://nodejs.org/), and [`hereby`](https://www.npmjs.com/package/hereby).
This repo uses [Go 1.25 or higher](https://go.dev/dl/), [Rust 1.85 or higher](https://www.rust-lang.org/tools/install), [Node.js with npm](https://nodejs.org/), and [`hereby`](https://www.npmjs.com/package/hereby).

For tests and code generation, this repo contains a git submodule to the main TypeScript repo pointing to the commit being ported.
When cloning, you'll want to clone with submodules:
Expand Down
2 changes: 1 addition & 1 deletion _tools/customlint/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module testdata

go 1.24.0
go 1.25
2 changes: 1 addition & 1 deletion _tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/microsoft/typescript-go/_tools

go 1.24.0
go 1.25

require (
github.com/golangci/plugin-module-register v0.1.2
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/microsoft/typescript-go

go 1.24.2
go 1.25

require (
github.com/dlclark/regexp2 v1.11.5
Expand Down
2 changes: 1 addition & 1 deletion internal/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +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
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w stringer_generated.go

type MessageType uint8

Expand Down
2 changes: 1 addition & 1 deletion internal/ast/kind.go
Original file line number Diff line number Diff line change
@@ -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.24 -w kind_stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w kind_stringer_generated.go

type Kind int16

Expand Down
2 changes: 1 addition & 1 deletion internal/checker/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.24 -w stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w stringer_generated.go

// ParseFlags

Expand Down
2 changes: 1 addition & 1 deletion internal/core/compileroptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.24 -w modulekind_stringer_generated.go scripttarget_stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w modulekind_stringer_generated.go scripttarget_stringer_generated.go

type CompilerOptions struct {
_ noCopy
Expand Down
2 changes: 1 addition & 1 deletion internal/core/languagevariant.go
Original file line number Diff line number Diff line change
@@ -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.24 -w languagevariant_stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w languagevariant_stringer_generated.go

type LanguageVariant int32

Expand Down
2 changes: 1 addition & 1 deletion internal/core/scriptkind.go
Original file line number Diff line number Diff line change
@@ -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.24 -w scriptkind_stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w scriptkind_stringer_generated.go

type ScriptKind int32

Expand Down
2 changes: 1 addition & 1 deletion internal/core/tristate.go
Original file line number Diff line number Diff line change
@@ -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.24 -w tristate_stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w tristate_stringer_generated.go

// Tristate

Expand Down
2 changes: 1 addition & 1 deletion internal/diagnostics/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.24 -w diagnostics_generated.go stringer_generated.go
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w diagnostics_generated.go stringer_generated.go

type Category int32

Expand Down
2 changes: 1 addition & 1 deletion internal/fourslash/_scripts/convertFourslash.mts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function main() {
parseTypeScriptFiles(getFailingTests(), getManualTests(), stradaFourslashPath);
console.log(unparsedFiles.join("\n"));
const gofmt = which.sync("go");
cp.execFileSync(gofmt, ["tool", "mvdan.cc/gofumpt", "-lang=go1.24", "-w", outputDir]);
cp.execFileSync(gofmt, ["tool", "mvdan.cc/gofumpt", "-lang=go1.25", "-w", outputDir]);
}

function parseTypeScriptFiles(failingTests: Set<string>, manualTests: Set<string>, folder: string): void {
Expand Down
2 changes: 1 addition & 1 deletion internal/lsp/lsproto/_generate/generate.mts
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ function main() {

// Format with gofmt
const gofmt = which.sync("go");
cp.execFileSync(gofmt, ["tool", "mvdan.cc/gofumpt", "-lang=go1.24", "-w", out]);
cp.execFileSync(gofmt, ["tool", "mvdan.cc/gofumpt", "-lang=go1.25", "-w", out]);

console.log(`Successfully generated ${out}`);
}
Expand Down
2 changes: 1 addition & 1 deletion internal/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w project_stringer_generated.go

const hr = "-----------------------------------------------"

Expand Down
2 changes: 1 addition & 1 deletion internal/testutil/projecttestutil/projecttestutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +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
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w clientmock_generated.go

type TestTypingsInstallerOptions struct {
TypesRegistry []string
Expand Down
2 changes: 1 addition & 1 deletion internal/vfs/vfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +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
//go:generate go tool mvdan.cc/gofumpt -lang=go1.25 -w vfsmock/mock_generated.go

// FS is a file system abstraction.
type FS interface {
Expand Down
Loading