Merge branch 'main' into disassembly-context

Author: thegecko

.configurations/configuration.dsc.yaml

@@ -12,11 +12,11 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: npm
       directives:
-        description: Install NodeJS version >=18.15.x and <19
+        description: Install NodeJS version 20
         allowPrerelease: true
       settings:
         id: OpenJS.NodeJS.LTS
-        version: "18.18.0"
+        version: "20.14.0"
         source: winget
     - resource: NpmDsc/NpmPackage
       id: yarn

.eslintrc.json

@@ -151,21 +151,13 @@
 					{
 						// Files should (only) be removed from the list they adopt the leak detector
 						"exclude": [
-							"src/vs/base/test/browser/browser.test.ts",
-							"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
-							"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
-							"src/vs/editor/test/common/services/languageService.test.ts",
-							"src/vs/editor/test/node/classification/typescript.test.ts",
 							"src/vs/platform/configuration/test/common/configuration.test.ts",
-							"src/vs/platform/extensions/test/common/extensionValidator.test.ts",
 							"src/vs/platform/opener/test/common/opener.test.ts",
 							"src/vs/platform/registry/test/common/platform.test.ts",
-							"src/vs/platform/remote/test/common/remoteHosts.test.ts",
 							"src/vs/platform/workspace/test/common/workspace.test.ts",
 							"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
 							"src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts",
-							"src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts",
 							"src/vs/workbench/api/test/node/extHostTunnelService.test.ts",
 							"src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts",
 							"src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts",
@@ -176,7 +168,6 @@
 							"src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts",
 							"src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts",
 							"src/vs/workbench/services/commands/test/common/commandService.test.ts",
-							"src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts",
 							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
 							"src/vs/workbench/test/browser/quickAccess.test.ts"
 						]
@@ -317,6 +308,10 @@
 						"selector": "BinaryExpression[operator='instanceof'][right.name='MouseEvent']",
 						"message": "Use DOM.isMouseEvent() to support multi-window scenarios."
 					},
+					{
+						"selector": "BinaryExpression[operator='instanceof'][right.name=/^HTML\\w+/]",
+						"message": "Use DOM.isHTMLElement() and related methods to support multi-window scenarios."
+					},
 					{
 						"selector": "BinaryExpression[operator='instanceof'][right.name='KeyboardEvent']",
 						"message": "Use DOM.isKeyboardEvent() to support multi-window scenarios."
@@ -650,7 +645,6 @@
 							"events",
 							"fs",
 							"fs/promises",
-							"graceful-fs",
 							"http",
 							"https",
 							"minimist",

.github/workflows/locker.yml

@@ -21,8 +21,8 @@ jobs:
         uses: ./actions/locker
         with:
           daysSinceClose: 45
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
           daysSinceUpdate: 3
           ignoredLabel: "*out-of-scope,accessibility"
           ignoreLabelUntil: "author-verification-requested"
+          ignoredMilestones: "Backlog Candidates"
           labelUntil: "verified"

.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

@@ -25,7 +25,7 @@ const TEST_FILE_PATTERN = 'src/vs/**/*.{test,integrationTest}.ts';
 
 const getWorkspaceFolderForTestFile = (uri: vscode.Uri) =>
 	(uri.path.endsWith('.test.ts') || uri.path.endsWith('.integrationTest.ts')) &&
-	uri.path.includes('/src/vs/')
+		uri.path.includes('/src/vs/')
 		? vscode.workspace.getWorkspaceFolder(uri)
 		: undefined;
 
@@ -41,6 +41,17 @@ export async function activate(context: vscode.ExtensionContext) {
 	const ctrl = vscode.tests.createTestController('selfhost-test-controller', 'VS Code Tests');
 	const fileChangedEmitter = new vscode.EventEmitter<FileChangeEvent>();
 
+	context.subscriptions.push(vscode.tests.registerTestFollowupProvider({
+		async provideFollowup(_result, test, taskIndex, messageIndex, _token) {
+			return [{
+				title: '$(sparkle) Ask copilot for help',
+				command: 'github.copilot.tests.fixTestFailure',
+				arguments: [{ source: 'peekFollowup', test, message: test.taskStates[taskIndex].messages[messageIndex] }]
+			}];
+		},
+	}));
+
+
 	ctrl.resolveHandler = async test => {
 		if (!test) {
 			context.subscriptions.push(await startWatchingWorkspace(ctrl, fileChangedEmitter));
@@ -62,7 +73,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	});
 
 	const createRunHandler = (
-		runnerCtor: { new (folder: vscode.WorkspaceFolder): VSCodeTestRunner },
+		runnerCtor: { new(folder: vscode.WorkspaceFolder): VSCodeTestRunner },
 		kind: vscode.TestRunProfileKind,
 		args: string[] = []
 	) => {

.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts

@@ -71,8 +71,6 @@ export class FailingDeepStrictEqualAssertFixer {
 				},
 			})
 		);
-
-		tests.testResults;
 	}
 
 	dispose() {
@@ -99,15 +97,15 @@ const formatJsonValue = (value: unknown) => {
 		context => (node: ts.Node) => {
 			const visitor = (node: ts.Node): ts.Node =>
 				ts.isPropertyAssignment(node) &&
-				ts.isStringLiteralLike(node.name) &&
-				identifierLikeRe.test(node.name.text)
+					ts.isStringLiteralLike(node.name) &&
+					identifierLikeRe.test(node.name.text)
 					? ts.factory.createPropertyAssignment(
-							ts.factory.createIdentifier(node.name.text),
-							ts.visitNode(node.initializer, visitor) as ts.Expression
-					  )
+						ts.factory.createIdentifier(node.name.text),
+						ts.visitNode(node.initializer, visitor) as ts.Expression
+					)
 					: ts.isStringLiteralLike(node) && node.text === '[undefined]'
-					? ts.factory.createIdentifier('undefined')
-					: ts.visitEachChild(node, visitor, context);
+						? ts.factory.createIdentifier('undefined')
+						: ts.visitEachChild(node, visitor, context);
 
 			return ts.visitNode(node, visitor);
 		},
@@ -190,7 +188,7 @@ class StrictEqualAssertion {
 		return undefined;
 	}
 
-	constructor(private readonly expression: ts.CallExpression) {}
+	constructor(private readonly expression: ts.CallExpression) { }
 
 	/** Gets the expected value */
 	public get expectedValue(): ts.Expression | undefined {

.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts

@@ -24,7 +24,7 @@ const ATTACH_CONFIG_NAME = 'Attach to VS Code';
 const DEBUG_TYPE = 'pwa-chrome';
 
 export abstract class VSCodeTestRunner {
-	constructor(protected readonly repoLocation: vscode.WorkspaceFolder) {}
+	constructor(protected readonly repoLocation: vscode.WorkspaceFolder) { }
 
 	public async run(baseArgs: ReadonlyArray<string>, filter?: ReadonlyArray<vscode.TestItem>) {
 		const args = this.prepareArguments(baseArgs, filter);
@@ -163,18 +163,40 @@ export abstract class VSCodeTestRunner {
 				path.relative(data.workspaceFolder.uri.fsPath, data.uri.fsPath).replace(/\\/g, '/')
 			);
 
+		const itemDatas = filter.map(f => itemData.get(f));
+		/** If true, we have to be careful with greps, as a grep for one test file affects the run of the other test file. */
+		const hasBothTestCaseOrTestSuiteAndTestFileFilters =
+			itemDatas.some(d => (d instanceof TestCase) || (d instanceof TestSuite)) &&
+			itemDatas.some(d => d instanceof TestFile);
+
+		function addTestCaseOrSuite(data: TestCase | TestSuite, test: vscode.TestItem): void {
+			grepRe.push(escapeRe(data.fullName) + (data instanceof TestCase ? '$' : ' '));
+			for (let p = test.parent; p; p = p.parent) {
+				const parentData = itemData.get(p);
+				if (parentData instanceof TestFile) {
+					addTestFileRunPath(parentData);
+				}
+			}
+		}
+
 		for (const test of filter) {
 			const data = itemData.get(test);
 			if (data instanceof TestCase || data instanceof TestSuite) {
-				grepRe.push(escapeRe(data.fullName) + (data instanceof TestCase ? '$' : ' '));
-				for (let p = test.parent; p; p = p.parent) {
-					const parentData = itemData.get(p);
-					if (parentData instanceof TestFile) {
-						addTestFileRunPath(parentData);
+				addTestCaseOrSuite(data, test);
+			} else if (data instanceof TestFile) {
+				if (!hasBothTestCaseOrTestSuiteAndTestFileFilters) {
+					addTestFileRunPath(data);
+				} else {
+					// We add all the items individually so they get their own grep expressions.
+					for (const [_id, nestedTest] of test.children) {
+						const childData = itemData.get(nestedTest);
+						if (childData instanceof TestCase || childData instanceof TestSuite) {
+							addTestCaseOrSuite(childData, nestedTest);
+						} else {
+							console.error('Unexpected test item in test file', nestedTest.id, nestedTest.label);
+						}
 					}
 				}
-			} else if (data instanceof TestFile) {
-				addTestFileRunPath(data);
 			}
 		}
 
@@ -303,5 +325,5 @@ export const PlatformTestRunner =
 	process.platform === 'win32'
 		? WindowsTestRunner
 		: process.platform === 'darwin'
-		? DarwinTestRunner
-		: PosixTestRunner;
+			? DarwinTestRunner
+			: PosixTestRunner;

.vscode/settings.json

@@ -170,6 +170,5 @@
 	},
 	"css.format.spaceAroundSelectorSeparator": true,
 	"inlineChat.mode": "live",
-	"typescript.enablePromptUseWorkspaceTsdk": true,
-	"typescript.tsserver.experimental.useVsCodeWatcher": true
+	"typescript.enablePromptUseWorkspaceTsdk": true
 }

ThirdPartyNotices.txt

@@ -517,7 +517,7 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-go-syntax 0.6.5 - MIT
+go-syntax 0.6.6 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -777,7 +777,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jeff-hykin/better-shell-syntax 1.8.3 - MIT
+jeff-hykin/better-shell-syntax 1.8.7 - MIT
 https://github.com/jeff-hykin/better-shell-syntax
 
 MIT License

build/.cachesalt

@@ -1 +1 @@
-2024-05-16T14:24:05.381Z
+2024-05-25T03:29:59.419Z

build/.moduleignore

@@ -20,6 +20,15 @@ fsevents/test/**
 @vscode/spdlog/*.yml
 !@vscode/spdlog/build/Release/*.node
 
+@vscode/deviceid/binding.gyp
+@vscode/deviceid/build/**
+@vscode/deviceid/deps/**
+@vscode/deviceid/src/**
+@vscode/deviceid/test/**
+@vscode/deviceid/*.yml
+!@vscode/deviceid/build/Release/*.node
+
+
 @vscode/sqlite3/binding.gyp
 @vscode/sqlite3/benchmark/**
 @vscode/sqlite3/cloudformation/**

build/azure-pipelines/linux/product-build-linux-test.yml

@@ -100,9 +100,6 @@ steps:
         timeoutInMinutes: 20
 
       - script: ./scripts/test-remote-integration.sh
-        env:
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         displayName: Run integration tests (Remote)
         timeoutInMinutes: 20
 
@@ -137,8 +134,6 @@ steps:
           ./scripts/test-remote-integration.sh
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         displayName: Run integration tests (Remote)
         timeoutInMinutes: 20
 
@@ -169,16 +164,10 @@ steps:
 
       - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         timeoutInMinutes: 20
-        env:
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         displayName: Run smoke tests (Browser, Chromium)
 
       - script: yarn smoketest-no-compile --remote --tracing
         timeoutInMinutes: 20
-        env:
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         displayName: Run smoke tests (Remote)
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -189,8 +178,6 @@ steps:
       - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         timeoutInMinutes: 20
         displayName: Run smoke tests (Browser, Chromium)
 
@@ -201,9 +188,6 @@ steps:
           VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)" \
           yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
         timeoutInMinutes: 20
-        env:
-          # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
-          UV_USE_IO_URING: 0
         displayName: Run smoke tests (Remote)
 
     - script: |

build/azure-pipelines/product-build.yml

@@ -164,7 +164,7 @@ resources:
     - repository: 1ESPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
-      ref: refs/heads/joao/disable-tsa-linux-arm64
+      ref: refs/tags/release
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines

build/azure-pipelines/product-compile.yml

@@ -135,13 +135,22 @@ steps:
 
     - script: |
         set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
+        AZURE_STORAGE_ACCOUNT="vscodeweb" \
         AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
         AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
         AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
           node build/azure-pipelines/upload-sourcemaps
       displayName: Upload sourcemaps to Azure
 
+    - script: |
+        set -e
+        AZURE_STORAGE_ACCOUNT="ticino" \
+        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+          node build/azure-pipelines/upload-sourcemaps
+      displayName: Upload sourcemaps to Azure (Deprecated)
+
     - script: ./build/azure-pipelines/common/extract-telemetry.sh
       displayName: Generate lists of telemetry events
 

build/azure-pipelines/web/product-build-web.yml

@@ -129,6 +129,15 @@ steps:
         node build/azure-pipelines/upload-cdn
     displayName: Upload to CDN
 
+  - script: |
+      set -e
+      AZURE_STORAGE_ACCOUNT="vscodeweb" \
+      AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+      AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+      AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+        node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.main.js.map
+    displayName: Upload sourcemaps (Web)
+
     # upload only the workbench.web.main.js source maps because
     # we just compiled these bits in the previous step and the
     # general task to upload source maps has already been run
@@ -139,7 +148,7 @@ steps:
       AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
       AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
         node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.main.js.map
-    displayName: Upload sourcemaps (Web)
+    displayName: Upload sourcemaps (Deprecated)
 
   - script: |
       set -e

build/checksums/nodejs.txt

@@ -1,7 +1,7 @@
-31d2d46ae8d8a3982f54e2ff1e60c2e4a8e80bf78a3e8b46dcaac95ac5d7ce6a  node-v20.9.0-darwin-arm64.tar.gz
-fc5b73f2a78c17bbe926cdb1447d652f9f094c79582f1be6471b4b38a2e1ccc8  node-v20.9.0-darwin-x64.tar.gz
-d2a7dbeeb274bfd16b579d2cafb92f673010df36c83a5b55de3916aad6806a6a  node-v20.9.0-linux-arm64.tar.gz
-a28a0de05177106d241ef426b3e006022bc7d242224adace7565868bd9ee6c06  node-v20.9.0-linux-armv7l.tar.gz
-f0919f092fbf74544438907fa083c21e76b2d7a4bc287f0607ada1553ef16f60  node-v20.9.0-linux-x64.tar.gz
-54e165b89e75158993910053db5b0e652c1826521e624126de5ca6de9ff7b06d  win-arm64/node.exe
-538140015da83597ea7e7ef5e108ebac8a2dc4784b2a4134222b6c27c39f90ad  win-x64/node.exe
+e0065c61f340e85106a99c4b54746c5cee09d59b08c5712f67f99e92aa44995d  node-v20.11.1-darwin-arm64.tar.gz
+c52e7fb0709dbe63a4cbe08ac8af3479188692937a7bd8e776e0eedfa33bb848  node-v20.11.1-darwin-x64.tar.gz
+e34ab2fc2726b4abd896bcbff0250e9b2da737cbd9d24267518a802ed0606f3b  node-v20.11.1-linux-arm64.tar.gz
+e42791f76ece283c7a4b97fbf716da72c5128c54a9779f10f03ae74a4bcfb8f6  node-v20.11.1-linux-armv7l.tar.gz
+bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7  node-v20.11.1-linux-x64.tar.gz
+a5a9d30a8f7d56e00ccb27c1a7d24c8d0bc96a2689ebba8eb7527698793496f1  win-arm64/node.exe
+bc585910690318aaebe3c57669cb83ca9d1e5791efd63195e238f54686e6c2ec  win-x64/node.exe

build/gulpfile.extensions.js

@@ -71,7 +71,7 @@ const compilations = [
 	'.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json',
 ];
 
-const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
+const getBaseUrl = out => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
 
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(root, tsconfigFile);