Skip to content

Commit eb7a51c

Browse files
jriekenjrieken
committed
Merge remote-tracking branch 'origin/main' into pr/jeanp413/200591
2 parents 51ea68d + 42c4cb5 commit eb7a51c

File tree

1,237 files changed

+32242
-14507
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,237 files changed

+32242
-14507
lines changed

‎.eslintrc.json

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -148,81 +148,26 @@
148148
{
149149
// Files should (only) be removed from the list they adopt the leak detector
150150
"exclude": [
151-
"src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts",
152151
"src/vs/base/test/browser/browser.test.ts",
153-
"src/vs/base/test/browser/comparers.test.ts",
154-
"src/vs/base/test/browser/hash.test.ts",
155-
"src/vs/base/test/browser/indexedDB.test.ts",
156-
"src/vs/base/test/browser/ui/menu/menubar.test.ts",
157152
"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
158153
"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
159-
"src/vs/base/test/common/arrays.test.ts",
160-
"src/vs/base/test/common/arraysFind.test.ts",
161-
"src/vs/base/test/common/cache.test.ts",
162-
"src/vs/base/test/common/charCode.test.ts",
163-
"src/vs/base/test/common/collections.test.ts",
164-
"src/vs/base/test/common/color.test.ts",
165-
"src/vs/base/test/common/decorators.test.ts",
166-
"src/vs/base/test/common/diff/diff.test.ts",
167-
"src/vs/base/test/common/errors.test.ts",
168-
"src/vs/base/test/common/filters.perf.test.ts",
169-
"src/vs/base/test/common/filters.test.ts",
170-
"src/vs/base/test/common/iconLabels.test.ts",
171-
"src/vs/base/test/common/iterator.test.ts",
172-
"src/vs/base/test/common/json.test.ts",
173-
"src/vs/base/test/common/jsonEdit.test.ts",
174-
"src/vs/base/test/common/jsonFormatter.test.ts",
175-
"src/vs/base/test/common/keybindings.test.ts",
176-
"src/vs/base/test/common/keyCodes.test.ts",
177-
"src/vs/base/test/common/linkedList.test.ts",
178-
"src/vs/base/test/common/linkedText.test.ts",
179-
"src/vs/base/test/common/map.test.ts",
180-
"src/vs/base/test/common/markdownString.test.ts",
181-
"src/vs/base/test/common/marshalling.test.ts",
182-
"src/vs/base/test/common/network.test.ts",
183-
"src/vs/base/test/common/observable.test.ts",
184-
"src/vs/base/test/common/path.test.ts",
185-
"src/vs/base/test/common/resources.test.ts",
186-
"src/vs/base/test/common/resourceTree.test.ts",
187-
"src/vs/base/test/common/scrollable.test.ts",
188-
"src/vs/base/test/common/skipList.test.ts",
189-
"src/vs/base/test/common/stripComments.test.ts",
190-
"src/vs/base/test/common/ternarySearchtree.test.ts",
191-
"src/vs/base/test/common/types.test.ts",
192-
"src/vs/base/test/common/uri.test.ts",
193-
"src/vs/base/test/common/uuid.test.ts",
194-
"src/vs/base/test/node/crypto.test.ts",
195-
"src/vs/base/test/node/css.build.test.ts",
196-
"src/vs/base/test/node/id.test.ts",
197-
"src/vs/base/test/node/snapshot.test.ts",
198154
"src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts",
199155
"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
200-
"src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts",
201-
"src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts",
202-
"src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts",
203-
"src/vs/editor/contrib/folding/test/browser/indentFold.test.ts",
204-
"src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts",
205156
"src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts",
206157
"src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts",
207-
"src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts",
208158
"src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts",
209-
"src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts",
210159
"src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts",
211160
"src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts",
212161
"src/vs/editor/test/common/services/languageService.test.ts",
213162
"src/vs/editor/test/node/classification/typescript.test.ts",
214163
"src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts",
215164
"src/vs/editor/test/node/diffing/fixtures.test.ts",
216165
"src/vs/platform/configuration/test/common/configuration.test.ts",
217-
"src/vs/platform/configuration/test/common/configurationModels.test.ts",
218-
"src/vs/platform/configuration/test/common/configurationRegistry.test.ts",
219166
"src/vs/platform/contextkey/test/common/contextkey.test.ts",
220167
"src/vs/platform/contextkey/test/common/parser.test.ts",
221168
"src/vs/platform/contextkey/test/common/scanner.test.ts",
222-
"src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts",
223169
"src/vs/platform/extensions/test/common/extensionValidator.test.ts",
224170
"src/vs/platform/instantiation/test/common/graph.test.ts",
225-
"src/vs/platform/instantiation/test/common/instantiationService.test.ts",
226171
"src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts",
227172
"src/vs/platform/keybinding/test/common/keybindingLabels.test.ts",
228173
"src/vs/platform/keybinding/test/common/keybindingResolver.test.ts",
@@ -232,17 +177,11 @@
232177
"src/vs/platform/registry/test/common/platform.test.ts",
233178
"src/vs/platform/remote/test/common/remoteHosts.test.ts",
234179
"src/vs/platform/telemetry/test/browser/1dsAppender.test.ts",
235-
"src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts",
236-
"src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts",
237-
"src/vs/platform/userDataSync/test/common/settingsMerge.test.ts",
238-
"src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts",
239180
"src/vs/platform/workspace/test/common/workspace.test.ts",
240181
"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
241-
"src/vs/server/test/node/serverConnectionToken.test.ts",
242182
"src/vs/workbench/api/test/browser/extHostApiCommands.test.ts",
243183
"src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts",
244184
"src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts",
245-
"src/vs/workbench/api/test/browser/extHostTextEditor.test.ts",
246185
"src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts",
247186
"src/vs/workbench/api/test/browser/extHostWorkspace.test.ts",
248187
"src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts",
@@ -253,37 +192,19 @@
253192
"src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts",
254193
"src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts",
255194
"src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts",
256-
"src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts",
257-
"src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts",
258-
"src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts",
259-
"src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts",
260-
"src/vs/workbench/contrib/notebook/test/browser/contrib/layoutActions.test.ts",
261-
"src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts",
262-
"src/vs/workbench/contrib/notebook/test/browser/notebookBrowser.test.ts",
263195
"src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts",
264196
"src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts",
265-
"src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts",
266-
"src/vs/workbench/contrib/search/test/common/extractRange.test.ts",
267197
"src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts",
268198
"src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts",
269199
"src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts",
270200
"src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts",
271201
"src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts",
272202
"src/vs/workbench/services/commands/test/common/commandService.test.ts",
273-
"src/vs/workbench/services/configuration/test/common/configurationModels.test.ts",
274203
"src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts",
275204
"src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts",
276205
"src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts",
277206
"src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts",
278207
"src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts",
279-
"src/vs/workbench/services/search/test/browser/queryBuilder.test.ts",
280-
"src/vs/workbench/services/search/test/common/ignoreFile.test.ts",
281-
"src/vs/workbench/services/search/test/common/queryBuilder.test.ts",
282-
"src/vs/workbench/services/search/test/common/replace.test.ts",
283-
"src/vs/workbench/services/search/test/common/searchHelpers.test.ts",
284-
"src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts",
285-
"src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts",
286-
"src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts",
287208
"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
288209
"src/vs/workbench/test/browser/quickAccess.test.ts"
289210
]

‎.github/classifier.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"editor-autoindent": {"assign": ["rebornix"]},
4040
"editor-bracket-matching": {"assign": ["hediet"]},
4141
"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
42-
"editor-code-actions": {"assign": ["mjbvz"]},
42+
"editor-code-actions": {"assign": ["mjbvz", "justschen"]},
4343
"editor-color-picker": {"assign": ["aiday-mar"]},
4444
"editor-columnselect": {"assign": ["alexdima"]},
4545
"editor-commands": {"assign": ["alexdima"]},
@@ -111,7 +111,7 @@
111111
"interactive-window": {"assign": ["amunger", "rebornix"]},
112112
"ipc": {"assign": ["joaomoreno"]},
113113
"issue-bot": {"assign": ["chrmarti"]},
114-
"issue-reporter": {"assign": ["TylerLeonhardt"]},
114+
"issue-reporter": {"assign": ["justschen"]},
115115
"javascript": {"assign": ["mjbvz"]},
116116
"json": {"assign": ["aeschli"]},
117117
"json-sorting": {"assign": ["aiday-mar"]},

‎.github/workflows/basic.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sudo update-rc.d xvfb defaults
3030
sudo service xvfb start
3131
32-
- uses: actions/setup-node@v3
32+
- uses: actions/setup-node@v4
3333
with:
3434
node-version-file: .nvmrc
3535

@@ -38,7 +38,7 @@ jobs:
3838
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
3939
- name: Cache node modules
4040
id: cacheNodeModules
41-
uses: actions/cache@v3
41+
uses: actions/cache@v4
4242
with:
4343
path: "**/node_modules"
4444
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -48,7 +48,7 @@ jobs:
4848
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
4949
- name: Cache yarn directory
5050
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
with:
5353
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
5454
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -61,7 +61,7 @@ jobs:
6161
run: yarn --frozen-lockfile --network-timeout 180000
6262

6363
- name: Compile and Download
64-
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64"
64+
run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64"
6565

6666
- name: Run Unit Tests
6767
id: electron-unit-tests
@@ -81,7 +81,7 @@ jobs:
8181
steps:
8282
- uses: actions/checkout@v4
8383

84-
- uses: actions/setup-node@v3
84+
- uses: actions/setup-node@v4
8585
with:
8686
node-version-file: .nvmrc
8787

@@ -90,7 +90,7 @@ jobs:
9090
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
9191
- name: Cache node modules
9292
id: cacheNodeModules
93-
uses: actions/cache@v3
93+
uses: actions/cache@v4
9494
with:
9595
path: "**/node_modules"
9696
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -100,7 +100,7 @@ jobs:
100100
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
101101
- name: Cache yarn directory
102102
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
103-
uses: actions/cache@v3
103+
uses: actions/cache@v4
104104
with:
105105
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
106106
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -143,7 +143,7 @@ jobs:
143143
steps:
144144
- uses: actions/checkout@v4
145145

146-
- uses: actions/setup-node@v3
146+
- uses: actions/setup-node@v4
147147
with:
148148
node-version-file: .nvmrc
149149

@@ -152,7 +152,7 @@ jobs:
152152
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
153153
- name: Cache node modules
154154
id: cacheNodeModules
155-
uses: actions/cache@v3
155+
uses: actions/cache@v4
156156
with:
157157
path: "**/node_modules"
158158
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -162,7 +162,7 @@ jobs:
162162
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
163163
- name: Cache yarn directory
164164
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
165-
uses: actions/cache@v3
165+
uses: actions/cache@v4
166166
with:
167167
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
168168
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}

‎.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- uses: actions/setup-node@v3
26+
- uses: actions/setup-node@v4
2727
with:
2828
node-version-file: .nvmrc
2929

@@ -36,7 +36,7 @@ jobs:
3636
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
3737
- name: Cache node_modules archive
3838
id: cacheNodeModules
39-
uses: actions/cache@v3
39+
uses: actions/cache@v4
4040
with:
4141
path: ".build/node_modules_cache"
4242
key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
5050
- name: Cache yarn directory
5151
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
52-
uses: actions/cache@v3
52+
uses: actions/cache@v4
5353
with:
5454
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
5555
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -69,7 +69,7 @@ jobs:
6969
7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
7070
7171
- name: Compile and Download
72-
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
72+
run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
7373

7474
- name: Compile Integration Tests
7575
run: yarn --cwd test/integration/browser compile
@@ -113,7 +113,7 @@ jobs:
113113
sudo update-rc.d xvfb defaults
114114
sudo service xvfb start
115115
116-
- uses: actions/setup-node@v3
116+
- uses: actions/setup-node@v4
117117
with:
118118
node-version-file: .nvmrc
119119

@@ -122,7 +122,7 @@ jobs:
122122
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
123123
- name: Cache node modules
124124
id: cacheNodeModules
125-
uses: actions/cache@v3
125+
uses: actions/cache@v4
126126
with:
127127
path: "**/node_modules"
128128
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -132,7 +132,7 @@ jobs:
132132
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
133133
- name: Cache yarn directory
134134
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
135-
uses: actions/cache@v3
135+
uses: actions/cache@v4
136136
with:
137137
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
138138
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -145,7 +145,7 @@ jobs:
145145
run: yarn --frozen-lockfile --network-timeout 180000
146146

147147
- name: Compile and Download
148-
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
148+
run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
149149

150150
- name: Compile Integration Tests
151151
run: yarn --cwd test/integration/browser compile
@@ -184,7 +184,7 @@ jobs:
184184
steps:
185185
- uses: actions/checkout@v4
186186

187-
- uses: actions/setup-node@v3
187+
- uses: actions/setup-node@v4
188188
with:
189189
node-version-file: .nvmrc
190190

@@ -193,7 +193,7 @@ jobs:
193193
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
194194
- name: Cache node modules
195195
id: cacheNodeModules
196-
uses: actions/cache@v3
196+
uses: actions/cache@v4
197197
with:
198198
path: "**/node_modules"
199199
key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -203,7 +203,7 @@ jobs:
203203
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
204204
- name: Cache yarn directory
205205
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
206-
uses: actions/cache@v3
206+
uses: actions/cache@v4
207207
with:
208208
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
209209
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -216,7 +216,7 @@ jobs:
216216
run: yarn --frozen-lockfile --network-timeout 180000
217217

218218
- name: Compile and Download
219-
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
219+
run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
220220

221221
- name: Compile Integration Tests
222222
run: yarn --cwd test/integration/browser compile
@@ -256,7 +256,7 @@ jobs:
256256
steps:
257257
- uses: actions/checkout@v4
258258

259-
- uses: actions/setup-node@v3
259+
- uses: actions/setup-node@v4
260260
with:
261261
node-version-file: .nvmrc
262262

@@ -265,7 +265,7 @@ jobs:
265265
run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
266266
- name: Cache node modules
267267
id: cacheNodeModules
268-
uses: actions/cache@v3
268+
uses: actions/cache@v4
269269
with:
270270
path: "**/node_modules"
271271
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -275,7 +275,7 @@ jobs:
275275
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
276276
- name: Cache yarn directory
277277
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
278-
uses: actions/cache@v3
278+
uses: actions/cache@v4
279279
with:
280280
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
281281
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}

0 commit comments

Comments
 (0)