Skip to content

Commit 12001f6

Browse files
adrianstephensadrianstephens
committed
Merge branch 'main' into enable-debug/watch/context-menu-contribution
2 parents 139addb + 768477e commit 12001f6

File tree

2,580 files changed

+142054
-56221
lines changed

Some content is hidden

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

2,580 files changed

+142054
-56221
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ pipelines:
1212
lastModifiedDate: 2024-09-10
1313
armory:
1414
lastModifiedDate: 2024-09-10
15+
accessibilityinsights:
16+
lastModifiedDate: 2025-06-02
1517
binary:
1618
credscan:
1719
lastModifiedDate: 2025-02-04

‎.configurations/configuration.dsc.yaml renamed to ‎.config/configuration.winget

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,33 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
directives:
77
description: Install Git
8-
allowPrerelease: true
8+
# Requires elevation for the set operation (i.e., for installing the package)
9+
securityContext: elevated
910
settings:
1011
id: Git.Git
1112
source: winget
1213
- resource: Microsoft.WinGet.DSC/WinGetPackage
1314
id: npm
1415
directives:
1516
description: Install NodeJS version 20
16-
allowPrerelease: true
17+
# Requires elevation for the set operation (i.e., for installing the package)
18+
securityContext: elevated
1719
settings:
1820
id: OpenJS.NodeJS.LTS
1921
version: "20.14.0"
2022
source: winget
2123
- resource: Microsoft.WinGet.DSC/WinGetPackage
2224
directives:
2325
description: Install Python 3.10
24-
allowPrerelease: true
2526
settings:
2627
id: Python.Python.3.10
2728
source: winget
2829
- resource: Microsoft.WinGet.DSC/WinGetPackage
2930
id: vsPackage
3031
directives:
3132
description: Install Visual Studio 2022 (any edition is OK)
32-
allowPrerelease: true
33+
# Requires elevation for the set operation (i.e., for installing the package)
34+
securityContext: elevated
3335
settings:
3436
id: Microsoft.VisualStudio.2022.BuildTools
3537
source: winget
@@ -38,6 +40,8 @@ properties:
3840
- vsPackage
3941
directives:
4042
description: Install required VS workloads
43+
# Requires elevation for the get and set operations
44+
securityContext: elevated
4145
allowPrerelease: true
4246
settings:
4347
productId: Microsoft.VisualStudio.Product.BuildTools

‎.config/guardian/.gdnbaselines

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,216 @@
250250
"createdDate": "2025-02-04 07:13:22Z",
251251
"expirationDate": "2025-07-24 07:25:17Z",
252252
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
253+
},
254+
"6216d3477ad4f56cb4ec316a9aaff02e9530a10d56469a4ef4063b8d02fe344b": {
255+
"signature": "6216d3477ad4f56cb4ec316a9aaff02e9530a10d56469a4ef4063b8d02fe344b",
256+
"alternativeSignatures": [
257+
"46ad210995b2ff199f3bee5f271938a4251ed7a60058041ace1beaa53e36b51c"
258+
],
259+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node.exe",
260+
"memberOf": [
261+
"default"
262+
],
263+
"tool": "binskim",
264+
"ruleId": "BA2008",
265+
"createdDate": "2025-06-02 21:46:49Z",
266+
"expirationDate": "2025-11-19 21:48:17Z",
267+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
268+
},
269+
"b8a4702fb4b855719e5e5033c3b629fbe6267d516ce8a18bd8f3be3b9962434b": {
270+
"signature": "b8a4702fb4b855719e5e5033c3b629fbe6267d516ce8a18bd8f3be3b9962434b",
271+
"alternativeSignatures": [
272+
"52d986be88f1c5696fc87d7794279d02f5084c645440e2dd2c3b5a2176b6bf52"
273+
],
274+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node.exe",
275+
"memberOf": [
276+
"default"
277+
],
278+
"tool": "binskim",
279+
"ruleId": "BA2008",
280+
"createdDate": "2025-06-02 21:46:49Z",
281+
"expirationDate": "2025-11-19 21:48:17Z",
282+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
283+
},
284+
"471f3e40d545a9d29754f7169c1e4e5b44c067f60ace4c4750b7e9abbaa76e4a": {
285+
"signature": "471f3e40d545a9d29754f7169c1e4e5b44c067f60ace4c4750b7e9abbaa76e4a",
286+
"alternativeSignatures": [
287+
"d8d66858e7ba56494a7b5cdc42278362e5191797dc9622de92f494928e0d8fa0"
288+
],
289+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@vscode/ripgrep/bin/rg.exe",
290+
"memberOf": [
291+
"default"
292+
],
293+
"tool": "binskim",
294+
"ruleId": "BA2008",
295+
"createdDate": "2025-06-02 21:46:49Z",
296+
"expirationDate": "2025-11-19 21:48:17Z",
297+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
298+
},
299+
"216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
300+
"signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
301+
"alternativeSignatures": [
302+
"07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
303+
],
304+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
305+
"memberOf": [
306+
"default"
307+
],
308+
"tool": "binskim",
309+
"ruleId": "BA2008",
310+
"createdDate": "2025-06-02 21:46:49Z",
311+
"expirationDate": "2025-11-19 21:48:17Z",
312+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
313+
},
314+
"1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef": {
315+
"signature": "1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef",
316+
"alternativeSignatures": [
317+
"679d725f3dda5ced7103a135600f67fb2b4ee66b286aa995205feb4eafa2e3b0"
318+
],
319+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@vscode/ripgrep/bin/rg.exe",
320+
"memberOf": [
321+
"default"
322+
],
323+
"tool": "binskim",
324+
"ruleId": "BA2008",
325+
"createdDate": "2025-06-02 21:46:49Z",
326+
"expirationDate": "2025-11-19 21:48:17Z",
327+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
328+
},
329+
"77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
330+
"signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
331+
"alternativeSignatures": [
332+
"4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
333+
],
334+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
335+
"memberOf": [
336+
"default"
337+
],
338+
"tool": "binskim",
339+
"ruleId": "BA2008",
340+
"createdDate": "2025-06-02 21:46:49Z",
341+
"expirationDate": "2025-11-19 21:48:17Z",
342+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
343+
},
344+
"21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101": {
345+
"signature": "21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101",
346+
"alternativeSignatures": [
347+
"09571db1cc8ea8e8292e9fcb6da3592a734a2314b4fc98ea97a87a7559ecdeea"
348+
],
349+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@parcel/watcher/build/Release/watcher.node",
350+
"memberOf": [
351+
"default"
352+
],
353+
"tool": "binskim",
354+
"ruleId": "BA2007",
355+
"createdDate": "2025-06-02 21:46:49Z",
356+
"expirationDate": "2025-11-19 21:48:17Z",
357+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
358+
},
359+
"4b3cc578ca0d51fe370dfe0fb2a654dc70cd8d498a62f1efa74028df9637d53b": {
360+
"signature": "4b3cc578ca0d51fe370dfe0fb2a654dc70cd8d498a62f1efa74028df9637d53b",
361+
"alternativeSignatures": [
362+
"ea934f0443da15b7f887884d4bf909c876fe2f689893677d63f95ee12f2b34ab"
363+
],
364+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@parcel/watcher/build/Release/watcher.node",
365+
"memberOf": [
366+
"default"
367+
],
368+
"tool": "binskim",
369+
"ruleId": "BA2008",
370+
"createdDate": "2025-06-02 21:46:49Z",
371+
"expirationDate": "2025-11-19 21:48:17Z",
372+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
373+
},
374+
"5fbddbcdd6dae78e3e2876c3198594a1f23b03bc4a2d34d1054c907e90f0f525": {
375+
"signature": "5fbddbcdd6dae78e3e2876c3198594a1f23b03bc4a2d34d1054c907e90f0f525",
376+
"alternativeSignatures": [
377+
"9b7cbe3971924b7a57556d4d37b67bc6d6624a19cdab5d0be6f70b588d25d273"
378+
],
379+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@parcel/watcher/build/Release/watcher.node",
380+
"memberOf": [
381+
"default"
382+
],
383+
"tool": "binskim",
384+
"ruleId": "BA2007",
385+
"createdDate": "2025-06-02 21:46:49Z",
386+
"expirationDate": "2025-11-19 21:48:17Z",
387+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
388+
},
389+
"5dade33533dba7144ce169a70ac1858e734d5bb95fd056b107b1dc7955ac140b": {
390+
"signature": "5dade33533dba7144ce169a70ac1858e734d5bb95fd056b107b1dc7955ac140b",
391+
"alternativeSignatures": [
392+
"d899dddcd071df9a15daf7cb3c5dd0a69d86903e5199f06afa07f1ca10de9ff2"
393+
],
394+
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@parcel/watcher/build/Release/watcher.node",
395+
"memberOf": [
396+
"default"
397+
],
398+
"tool": "binskim",
399+
"ruleId": "BA2008",
400+
"createdDate": "2025-06-02 21:46:49Z",
401+
"expirationDate": "2025-11-19 21:48:17Z",
402+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
403+
},
404+
"8314c7866547b515200d8a02a7ad2d86053f170172ca056ae2b71ace5fd79a04": {
405+
"signature": "8314c7866547b515200d8a02a7ad2d86053f170172ca056ae2b71ace5fd79a04",
406+
"alternativeSignatures": [
407+
"d33a0c2987713428bb7fc768be76919de7d7ea04d44d0339f561a044a2616eb8"
408+
],
409+
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@vscode/ripgrep/bin/rg.exe",
410+
"memberOf": [
411+
"default"
412+
],
413+
"tool": "binskim",
414+
"ruleId": "BA2008",
415+
"createdDate": "2025-06-02 21:46:49Z",
416+
"expirationDate": "2025-11-19 21:48:17Z",
417+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
418+
},
419+
"30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
420+
"signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
421+
"alternativeSignatures": [
422+
"b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
423+
],
424+
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
425+
"memberOf": [
426+
"default"
427+
],
428+
"tool": "binskim",
429+
"ruleId": "BA2008",
430+
"createdDate": "2025-06-02 21:46:49Z",
431+
"expirationDate": "2025-11-19 21:48:17Z",
432+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
433+
},
434+
"d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000": {
435+
"signature": "d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000",
436+
"alternativeSignatures": [
437+
"e4084ce79a4fed95d29189c3b10811b131a35328957ed32f16366d110fcfeafd"
438+
],
439+
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@parcel/watcher/build/Release/watcher.node",
440+
"memberOf": [
441+
"default"
442+
],
443+
"tool": "binskim",
444+
"ruleId": "BA2007",
445+
"createdDate": "2025-06-02 21:46:49Z",
446+
"expirationDate": "2025-11-19 21:48:17Z",
447+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
448+
},
449+
"bb5daeeb456c17015d07ff8744bc8058ee8c66d6542554fc0d81296c179c3e1f": {
450+
"signature": "bb5daeeb456c17015d07ff8744bc8058ee8c66d6542554fc0d81296c179c3e1f",
451+
"alternativeSignatures": [
452+
"40b43227b215520ac1cb5683304d90b739718b97e8863c69164e2871065b6720"
453+
],
454+
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@parcel/watcher/build/Release/watcher.node",
455+
"memberOf": [
456+
"default"
457+
],
458+
"tool": "binskim",
459+
"ruleId": "BA2008",
460+
"createdDate": "2025-06-02 21:46:49Z",
461+
"expirationDate": "2025-11-19 21:48:17Z",
462+
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
253463
}
254464
}
255465
}

‎.config/guardian/.gdnsuppress

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"hydrated": false,
3+
"properties": {
4+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions"
5+
},
6+
"version": "1.0.0",
7+
"suppressionSets": {
8+
"default": {
9+
"name": "default",
10+
"createdDate": "2025-03-17 11:52:32Z",
11+
"lastUpdatedDate": "2025-03-17 11:52:32Z"
12+
}
13+
},
14+
"results": {
15+
"216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
16+
"signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
17+
"alternativeSignatures": [
18+
"07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
19+
],
20+
"memberOf": [
21+
"default"
22+
],
23+
"createdDate": "2025-03-17 11:52:32Z"
24+
},
25+
"77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
26+
"signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
27+
"alternativeSignatures": [
28+
"4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
29+
],
30+
"memberOf": [
31+
"default"
32+
],
33+
"createdDate": "2025-03-17 11:52:32Z"
34+
},
35+
"30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
36+
"signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
37+
"alternativeSignatures": [
38+
"b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
39+
],
40+
"memberOf": [
41+
"default"
42+
],
43+
"createdDate": "2025-03-17 11:52:32Z"
44+
}
45+
}
46+
}

‎.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Next, let's try debugging.
9999

100100
2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
101101

102-
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
102+
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
103103
104104
3. After a bit, Code - OSS will appear with the debugger attached!
105105

‎.devcontainer/devcontainer-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"integrity": "sha256:e7dc4d37ab9e3d6e7ebb221bac741f5bfe07dae47025399d038b17af2ed8ddb7"
77
},
88
"ghcr.io/devcontainers/features/rust:1": {
9-
"version": "1.1.3",
10-
"resolved": "ghcr.io/devcontainers/features/rust@sha256:aba6f47303b197976902bf544c786b5efecc03c238ff593583e5e74dfa9c7ccb",
11-
"integrity": "sha256:aba6f47303b197976902bf544c786b5efecc03c238ff593583e5e74dfa9c7ccb"
9+
"version": "1.3.3",
10+
"resolved": "ghcr.io/devcontainers/features/rust@sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995",
11+
"integrity": "sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995"
1212
}
1313
}
1414
}

‎.eslint-ignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
**/extensions/simple-browser/media/index.js
1515
**/extensions/terminal-suggest/src/completions/upstream/**
1616
**/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
17+
**/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
1718
**/extensions/terminal-suggest/third_party/**
1819
**/extensions/typescript-language-features/test-workspace/**
1920
**/extensions/typescript-language-features/extension.webpack.config.js
@@ -36,4 +37,5 @@
3637
**/test/unit/assert.js
3738
**/test/automation/out/**
3839
**/typings/**
40+
**/.build/**
3941
!.vscode

‎.eslint-plugin-local/code-amd-node-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
5151
node,
5252
messageId: 'amdX'
5353
});
54-
}
54+
};
5555

5656
return {
5757
['ImportExpression Literal']: checkImport,

‎.eslint-plugin-local/code-declare-service-brand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
1919
node,
2020
message: `The '_serviceBrand'-property should not have a value`,
2121
fix: (fixer) => {
22-
return fixer.replaceText(node, 'declare _serviceBrand: undefined;')
22+
return fixer.replaceText(node, 'declare _serviceBrand: undefined;');
2323
}
2424
});
2525
}

‎.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
2727

2828
return {
2929
[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => {
30-
const src = context.getSourceCode().getText(node)
30+
const src = context.getSourceCode().getText(node);
3131
if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) {
3232
context.report({
3333
node,

0 commit comments

Comments
 (0)