Skip to content

Commit 3718fca

Browse files
committed
Merge branch 'main' into ercornel/moduleResolution
2 parents 646a75a + 360255e commit 3718fca

File tree

25,699 files changed

+530618
-368079
lines changed

Some content is hidden

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

25,699 files changed

+530618
-368079
lines changed

.dprint.jsonc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"cwd": "${configDir}",
4242
"cacheKey": "4",
4343
"commands": [
44-
{ "command": "gofumpt -lang=go1.24", "exts": ["go"] }
44+
{ "command": "go tool mvdan.cc/gofumpt -lang=go1.24", "exts": ["go"] }
4545
]
4646
},
4747
"excludes": [
@@ -53,7 +53,9 @@
5353
"**/*_generated.go",
5454
"internal/bundled/libs/**",
5555
"internal/lsp/lsproto/_generate/*.json",
56-
"internal/lsp/lsproto/_generate/metaModelSchema.mts"
56+
"internal/lsp/lsproto/_generate/metaModelSchema.mts",
57+
// Needs to be LF to have a working shebang.
58+
"_packages/native-preview/bin/tsgo.js"
5759
],
5860
// Note: if adding new languages, make sure settings.template.json is updated too.
5961
// Also, if updating typescript, update the one in package.json.

.github/actions/setup-go/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
steps:
1515
- name: Install Go
1616
id: install-go
17-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
17+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1818
with:
1919
go-version: ${{ inputs.go-version }}
2020
cache: false

.github/workflows/ci.yml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ jobs:
3131
with:
3232
cache-name: build
3333

34+
# Avoid duplicate PR annotations.
35+
- name: Disable PR annotations
36+
run: |
37+
echo "::remove-matcher owner=eslint-compact::"
38+
echo "::remove-matcher owner=eslint-stylish::"
39+
echo "::remove-matcher owner=tsc::"
40+
echo "::remove-matcher owner=go::"
41+
3442
- run: npm ci
3543

3644
- run: npx hereby build
@@ -53,6 +61,7 @@ jobs:
5361
config:
5462
- os: ubuntu-latest
5563
coverage: true
64+
main: true
5665
- os: windows-latest
5766
coverage: true
5867
skip: ${{ github.event_name == 'merge_group' }}
@@ -106,6 +115,15 @@ jobs:
106115
with:
107116
cache-name: test
108117

118+
# Avoid duplicate PR annotations.
119+
- if: ${{ ! matrix.config.main }}
120+
name: Disable PR annotations
121+
run: |
122+
echo "::remove-matcher owner=eslint-compact::"
123+
echo "::remove-matcher owner=eslint-stylish::"
124+
echo "::remove-matcher owner=tsc::"
125+
echo "::remove-matcher owner=go::"
126+
109127
- run: npm ci
110128

111129
- run: go install gotest.tools/gotestsum@latest
@@ -155,6 +173,7 @@ jobs:
155173
matrix:
156174
config:
157175
- os: ubuntu-latest
176+
main: true
158177
- os: windows-latest
159178
skip: ${{ github.event_name == 'merge_group' }}
160179
- os: macos-latest
@@ -182,6 +201,15 @@ jobs:
182201
with:
183202
cache-name: lint${{ (matrix.config.noembed && '-noembed') || ''}}
184203

204+
# Avoid duplicate PR annotations.
205+
- if: ${{ ! matrix.config.main }}
206+
name: Disable PR annotations
207+
run: |
208+
echo "::remove-matcher owner=eslint-compact::"
209+
echo "::remove-matcher owner=eslint-stylish::"
210+
echo "::remove-matcher owner=tsc::"
211+
echo "::remove-matcher owner=go::"
212+
185213
- run: npm ci
186214

187215
- run: npx hereby lint
@@ -198,7 +226,6 @@ jobs:
198226

199227
- run: npm ci
200228

201-
- run: npx hereby install-tools
202229
- run: npx hereby check:format
203230

204231
generate:
@@ -246,6 +273,14 @@ jobs:
246273
with:
247274
cache-name: smoke
248275

276+
# Avoid duplicate PR annotations.
277+
- name: Disable PR annotations
278+
run: |
279+
echo "::remove-matcher owner=eslint-compact::"
280+
echo "::remove-matcher owner=eslint-stylish::"
281+
echo "::remove-matcher owner=tsc::"
282+
echo "::remove-matcher owner=go::"
283+
249284
- run: npm ci
250285

251286
- run: npx hereby build --race

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,5 @@ custom-gcl.hash
194194
.idea
195195

196196
!testdata/submoduleAccepted.txt
197+
198+
!NOTICE.txt

0 commit comments

Comments
 (0)