Skip to content

Commit ea1ac02

Browse files
committed
Merge branch 'main' of https://github.com/microsoft/typescript-go into formatOptions
2 parents ca78105 + 20bf4fc commit ea1ac02

File tree

4,325 files changed

+51996
-17052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,325 files changed

+51996
-17052
lines changed

.custom-gcl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json
22

3-
version: v2.6.2
3+
version: v2.7.2
44

55
destination: ./_tools
66

.dprint.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
// Note: if adding new languages, make sure settings.template.json is updated too.
5959
// Also, if updating typescript, update the one in package.json.
6060
"plugins": [
61-
"https://plugins.dprint.dev/typescript-0.95.12.wasm",
61+
"https://plugins.dprint.dev/typescript-0.95.13.wasm",
6262
"https://plugins.dprint.dev/json-0.21.0.wasm",
6363
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
6464
"https://plugins.dprint.dev/exec-0.6.0.json@a054130d458f124f9b5c91484833828950723a5af3f8ff2bd1523bd47b83b364"

.github/workflows/ci.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
build:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
28-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
27+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
2929
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
3030
- uses: ./.github/actions/setup-go
3131

@@ -44,8 +44,8 @@ jobs:
4444
extension:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
48-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
47+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
48+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
4949
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
5050

5151
- run: npm ci
@@ -54,7 +54,7 @@ jobs:
5454

5555
test:
5656
strategy:
57-
fail-fast: false
57+
fail-fast: ${{ github.event_name == 'merge_group' }}
5858
matrix:
5959
config:
6060
- os: ubuntu-latest
@@ -109,10 +109,10 @@ jobs:
109109
- run: git config --system core.longpaths true
110110
if: ${{ matrix.config.os == 'windows-latest' }}
111111

112-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
112+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
113113
with:
114114
submodules: ${{ !matrix.config.no-submodules }}
115-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
115+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
116116
with:
117117
node-version: 'lts/*'
118118
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
@@ -172,7 +172,7 @@ jobs:
172172

173173
lint:
174174
strategy:
175-
fail-fast: false
175+
fail-fast: ${{ github.event_name == 'merge_group' }}
176176
matrix:
177177
config:
178178
- os: ubuntu-latest
@@ -204,8 +204,8 @@ jobs:
204204
docker-images: false
205205
swap-storage: false
206206
dotnet: false
207-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
208-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
207+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
208+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
209209
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
210210
- uses: ./.github/actions/setup-go
211211
with:
@@ -227,8 +227,8 @@ jobs:
227227
format:
228228
runs-on: ubuntu-latest
229229
steps:
230-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
231-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
230+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
231+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
232232
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
233233
- uses: ./.github/actions/setup-go
234234

@@ -245,10 +245,10 @@ jobs:
245245
docker-images: false
246246
swap-storage: false
247247
dotnet: false
248-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
248+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
249249
with:
250250
submodules: true
251-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
251+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
252252
with:
253253
node-version: '>=22.16.0'
254254
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
@@ -281,7 +281,7 @@ jobs:
281281
tidy:
282282
runs-on: ubuntu-latest
283283
steps:
284-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
284+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
285285
- uses: ./.github/actions/setup-go
286286

287287
- run: go mod tidy -diff
@@ -290,10 +290,10 @@ jobs:
290290
smoke:
291291
runs-on: ubuntu-latest
292292
steps:
293-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
293+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
294294
with:
295295
submodules: true
296-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
296+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
297297
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
298298
- uses: ./.github/actions/setup-go
299299

@@ -318,7 +318,7 @@ jobs:
318318
misc:
319319
runs-on: ubuntu-latest
320320
steps:
321-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
321+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
322322
- uses: ./.github/actions/setup-go
323323

324324
- run: go -C ./_tools run ./cmd/checkmodpaths $PWD
@@ -332,10 +332,10 @@ jobs:
332332
docker-images: false
333333
swap-storage: false
334334
dotnet: false
335-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
335+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
336336
with:
337337
submodules: true
338-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
338+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
339339
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
340340
- uses: ./.github/actions/setup-go
341341

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
47+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
51+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
5252
with:
5353
config-file: ./.github/codeql/codeql-configuration.yml
5454
# Override language selection by uncommenting this and choosing your languages
@@ -58,7 +58,7 @@ jobs:
5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below).
6060
- name: Autobuild
61-
uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
61+
uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
6262

6363
# ℹ️ Command-line programs to run using the OS shell.
6464
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,4 +72,4 @@ jobs:
7272
# make release
7373

7474
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
75+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
docker-images: false
2323
swap-storage: false
2424
dotnet: false
25-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
25+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
with:
2727
submodules: true
28-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
28+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
2929
with:
3030
node-version: '>=22.16.0'
3131
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable

.github/workflows/create-cache.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343
- run: git config --system core.longpaths true
4444
if: ${{ matrix.os == 'windows-latest' }}
4545

46-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
46+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4747
with:
4848
submodules: true
49-
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
49+
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
5050
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
5151

5252
- uses: ./.github/actions/setup-go

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,4 @@ custom-gcl.hash
199199

200200
!internal/fourslash/_scripts/failingTests.txt
201201
!internal/fourslash/_scripts/manualTests.txt
202+
!internal/fourslash/_scripts/crashingTests.txt

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ f.called = false;
5151

5252
| Name | Example | Substitute | Note |
5353
| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
54-
| Fallback initialisers | `f.x = f.x \| init` | `if (!f.x) f.x = init` | |
54+
| Fallback initialisers | `f.x = f.x \|\| init` | `if (!f.x) f.x = init` | |
5555
| Nested, undeclared expandos | <pre><code>var N = {};</code><br/><code>N.X.Y = {}</code></pre> | <pre><code>var N = {};</code><br/><code>N.X = {};</code><br/><code>N.X.Y = {}</code></pre> | All intermediate expandos have to be assigned. Closure feature. |
5656
| Constructor function whole-prototype assignment | <pre><code>C.prototype = {</code><br/> <code>m: function() { }</code><br/> <code>n: function() { }</code><br/><code>}</code></pre> | <pre><code>C.prototype.m = function() { }</code><br/><code>C.prototype.n = function() { }</code></pre> | Constructor function feature. See note at end. |
5757
| Identifier declarations | <pre><code>class C {</code><br/> <code>constructor() {</code><br/> <code>/\** @type {T} */</code><br/> <code>identifier;</code><br/> <code>}</code><br/><code>}</code></pre> | <pre><code>class C {</code><br/> <code>/\** @type {T} */</code><br/> <code>identifier;</code><br/> <code>constructor() { }</code><br/><code>}</code></pre> | Closure feature. |

Herebyfile.mjs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,13 @@ const customLinterPath = "./_tools/custom-gcl";
399399
const customLinterHashPath = customLinterPath + ".hash";
400400

401401
const golangciLintPackage = memoize(() => {
402-
// const golangciLintYml = fs.readFileSync(".custom-gcl.yml", "utf8");
403-
// const pattern = /^version:\s*(v\d+\.\d+\.\d+).*$/m;
404-
// const match = pattern.exec(golangciLintYml);
405-
// if (!match) {
406-
// throw new Error("Expected version in .custom-gcl.yml");
407-
// }
408-
// const version = match[1];
409-
const version = "v2.6.3-0.20251130135459-0212d7c8deac"; // https://github.com/golangci/golangci-lint/issues/6205
402+
const golangciLintYml = fs.readFileSync(".custom-gcl.yml", "utf8");
403+
const pattern = /^version:\s*(v\d+\.\d+\.\d+).*$/m;
404+
const match = pattern.exec(golangciLintYml);
405+
if (!match) {
406+
throw new Error("Expected version in .custom-gcl.yml");
407+
}
408+
const version = match[1];
410409
const major = version.split(".")[0];
411410
const versionSuffix = ["v0", "v1"].includes(major) ? "" : "/" + major;
412411

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
251251

252252
---------------------------------------------------------
253253

254-
golang.org/x/sync v0.18.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
254+
golang.org/x/sync v0.19.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
255255

256256

257257
Copyright 2009 The Go Authors
@@ -266,7 +266,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
266266

267267
---------------------------------------------------------
268268

269-
golang.org/x/sys v0.38.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
269+
golang.org/x/sys v0.39.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
270270

271271

272272
Copyright 2009 The Go Authors
@@ -294,7 +294,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
294294

295295
---------------------------------------------------------
296296

297-
golang.org/x/term v0.37.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
297+
golang.org/x/term v0.38.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
298298

299299

300300
Copyright 2009 The Go Authors
@@ -309,7 +309,7 @@ BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
309309

310310
---------------------------------------------------------
311311

312-
golang.org/x/text v0.31.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
312+
golang.org/x/text v0.32.0 - BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
313313

314314

315315
(c) (c) A

0 commit comments

Comments
 (0)