Skip to content

Commit c7c4b49

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents e933269 + 0380d81 commit c7c4b49

File tree

1,207 files changed

+27864
-16234
lines changed

Some content is hidden

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

1,207 files changed

+27864
-16234
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@
259259
"windows-process-tree",
260260
"worker_threads",
261261
"xterm",
262+
"xterm-addon-canvas",
262263
"xterm-addon-search",
263264
"xterm-addon-serialize",
264265
"xterm-addon-unicode11",

‎.github/commands.json

Lines changed: 56 additions & 10 deletions
Large diffs are not rendered by default.

‎.github/pull_request_template.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
* Ensure that the code is up-to-date with the `main` branch.
66
* Include a description of the proposed changes and how to test them.
77
-->
8-
9-
This PR fixes #

‎.github/workflows/basic.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ jobs:
3939
uses: actions/cache@v3
4040
with:
4141
path: "**/node_modules"
42-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
43-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
42+
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
4443
- name: Get yarn cache directory path
4544
id: yarnCacheDirPath
4645
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -92,8 +91,7 @@ jobs:
9291
uses: actions/cache@v3
9392
with:
9493
path: "**/node_modules"
95-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
96-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
94+
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
9795
- name: Get yarn cache directory path
9896
id: yarnCacheDirPath
9997
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -155,8 +153,7 @@ jobs:
155153
uses: actions/cache@v3
156154
with:
157155
path: "**/node_modules"
158-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
159-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
156+
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
160157
- name: Get yarn cache directory path
161158
id: yarnCacheDirPath
162159
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

‎.github/workflows/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ jobs:
125125
uses: actions/cache@v2
126126
with:
127127
path: "**/node_modules"
128-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
129-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
128+
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
130129
- name: Get yarn cache directory path
131130
id: yarnCacheDirPath
132131
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -197,8 +196,7 @@ jobs:
197196
uses: actions/cache@v2
198197
with:
199198
path: "**/node_modules"
200-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
201-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
199+
key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }}
202200
- name: Get yarn cache directory path
203201
id: yarnCacheDirPath
204202
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -271,8 +269,7 @@ jobs:
271269
uses: actions/cache@v2
272270
with:
273271
path: "**/node_modules"
274-
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
275-
restore-keys: ${{ runner.os }}-cacheNodeModules22-
272+
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
276273
- name: Get yarn cache directory path
277274
id: yarnCacheDirPath
278275
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

‎.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v1
27+
uses: github/codeql-action/init@v2
2828
with:
2929
languages: javascript
3030

3131
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3232
# If this step fails, then you should remove it and run the build manually (see below)
3333
- name: Autobuild
34-
uses: github/codeql-action/autobuild@v1
34+
uses: github/codeql-action/autobuild@v2
3535

3636
# ℹ️ Command-line programs to run using the OS shell.
3737
# 📚 https://git.io/JvXDl
@@ -45,4 +45,4 @@ jobs:
4545
# make release
4646

4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@v1
48+
uses: github/codeql-action/analyze@v2

‎.github/workflows/deep-classifier-runner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: ./actions/classifier-deep/apply/apply-labels
4747
with:
4848
configPath: classifier
49-
allowLabels: "needs more info|new release|error-telemetry|*english-please|translation-required"
49+
allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required"
5050
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
5151
manifestDbConnectionString: ${{secrets.MANIFEST_DB_CONNECTION_STRING}}
5252
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

‎.github/workflows/english-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
2525
cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
2626
nonEnglishLabel: "*english-please"
27-
needsMoreInfoLabel: "needs more info"
27+
needsMoreInfoLabel: "info-needed"
2828
translatorRequestedLabelPrefix: "translation-required-"
2929
translatorRequestedLabelColor: "c29cff"

‎.github/workflows/needs-more-info-closer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Needs More Info Closer
1+
name: info-needed Closer
22
on:
33
schedule:
44
- cron: 20 11 * * * # 4:20am Redmond
@@ -17,12 +17,12 @@ jobs:
1717
ref: stable
1818
- name: Install Actions
1919
run: npm install --production --prefix ./actions
20-
- name: Run Needs More Info Closer
20+
- name: Run info-needed Closer
2121
uses: ./actions/needs-more-info-closer
2222
with:
2323
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
2424
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
25-
label: needs more info
25+
label: info-needed
2626
closeDays: 7
2727
additionalTeam: "cleidigh|usernamehw|gjsjohnmurray|IllusionMH"
2828
closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"

‎.github/workflows/on-label.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ jobs:
7171
if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
7272
uses: ./actions/test-plan-item-validator
7373
with:
74-
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
74+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
75+
refLabel: on-testplan
7576
label: testplan-item
7677
invalidLabel: invalid-testplan-item
7778
comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
@@ -85,6 +86,6 @@ jobs:
8586
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
8687
cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
8788
nonEnglishLabel: "*english-please"
88-
needsMoreInfoLabel: "needs more info"
89+
needsMoreInfoLabel: "info-needed"
8990
translatorRequestedLabelPrefix: "translation-required-"
9091
translatorRequestedLabelColor: "c29cff"

0 commit comments

Comments
 (0)