Merge branch 'main' into disassembly-context

.eslintrc.json

@@ -666,6 +666,7 @@
 							"vscode-regexpp",
 							"vscode-textmate",
 							"worker_threads",
+							"@xterm/addon-clipboard",
 							"@xterm/addon-image",
 							"@xterm/addon-search",
 							"@xterm/addon-serialize",

.github/classifier.json

@@ -32,7 +32,7 @@
 		"debug": {"assign": ["roblourens"]},
 		"debug-disassembly": {"assign": []},
 		"dialogs": {"assign": ["sbatten"]},
-		"diff-editor": {"assign": ["alexdima"]},
+		"diff-editor": {"assign": ["hediet"]},
 		"dropdown": {"assign": ["lramos15"]},
 		"editor-api": {"assign": ["alexdima"]},
 		"editor-autoclosing": {"assign": ["alexdima"]},
@@ -116,7 +116,7 @@
 		"json": {"assign": ["aeschli"]},
 		"json-sorting": {"assign": ["aiday-mar"]},
 		"keybindings": {"assign": ["ulugbekna"]},
-		"keybindings-editor": {"assign": ["sandy081"]},
+		"keybindings-editor": {"assign": ["ulugbekna"]},
 		"keyboard-layout": {"assign": ["ulugbekna"]},
 		"L10N": {"assign": ["TylerLeonhardt", "csigs"]},
 		"l10n-platform": {"assign": ["TylerLeonhardt"]},

.github/workflows/locker.yml

@@ -1,7 +1,7 @@
 name: Locker
 on:
   schedule:
-    - cron: 20 23 * * * # 4:20pm Redmond
+    - cron: 20 * * * * # run on the 20th minute of every hour
   repository_dispatch:
     types: [trigger-locker]
 
@@ -20,6 +20,7 @@ jobs:
       - name: Run Locker
         uses: ./actions/locker
         with:
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
           daysSinceClose: 45
           daysSinceUpdate: 3
           ignoredLabel: "*out-of-scope,accessibility"

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

@@ -119,7 +119,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				map,
 				task,
 				kind === vscode.TestRunProfileKind.Debug
-					? await runner.debug(currentArgs, req.include)
+					? await runner.debug(task, currentArgs, req.include)
 					: await runner.run(currentArgs, req.include),
 				coverageDir,
 				cancellationToken

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

@@ -37,7 +37,7 @@ export abstract class VSCodeTestRunner {
 		return new TestOutputScanner(cp, args);
 	}
 
-	public async debug(baseArgs: ReadonlyArray<string>, filter?: ReadonlyArray<vscode.TestItem>) {
+	public async debug(testRun: vscode.TestRun, baseArgs: ReadonlyArray<string>, filter?: ReadonlyArray<vscode.TestItem>) {
 		const port = await this.findOpenPort();
 		const baseConfiguration = vscode.workspace
 			.getConfiguration('launch', this.repoLocation)
@@ -95,7 +95,7 @@ export abstract class VSCodeTestRunner {
 			},
 		});
 
-		vscode.debug.startDebugging(this.repoLocation, { ...baseConfiguration, port });
+		vscode.debug.startDebugging(this.repoLocation, { ...baseConfiguration, port }, { testRun });
 
 		let exited = false;
 		let rootSession: vscode.DebugSession | undefined;

.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json

@@ -12,5 +12,6 @@
 		"../../../src/vscode-dts/vscode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts",
+		"../../../src/vscode-dts/vscode.proposed.testRunInDebug.d.ts",
 	]
 }

build/.webignore

@@ -20,6 +20,9 @@ vscode-textmate/webpack.config.js
 
 @xterm/xterm/src/**
 
+@xterm/addon-clipboard/src/**
+@xterm/addon-clipboard/out/**
+
 @xterm/addon-image/src/**
 @xterm/addon-image/out/**
 

build/gulpfile.reh.js

@@ -129,7 +129,8 @@ function getNodeChecksum(nodeVersion, platform, arch, glibcPrefix) {
 	let expectedName;
 	switch (platform) {
 		case 'win32':
-			expectedName = `win-${arch}/node.exe`;
+			expectedName = product.nodejsRepository !== 'https://nodejs.org' ?
+				`win-${arch}-node.exe` : `win-${arch}/node.exe`;
 			break;
 
 		case 'darwin':

build/gulpfile.vscode.linux.js

@@ -8,17 +8,20 @@
 const gulp = require('gulp');
 const replace = require('gulp-replace');
 const rename = require('gulp-rename');
-const shell = require('gulp-shell');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
-const util = require('./lib/util');
+const { rimraf } = require('./lib/util');
 const { getVersion } = require('./lib/getVersion');
 const task = require('./lib/task');
 const packageJson = require('../package.json');
 const product = require('../product.json');
 const dependenciesGenerator = require('./linux/dependencies-generator');
 const debianRecommendedDependencies = require('./linux/debian/dep-lists').recommendedDeps;
 const path = require('path');
+const cp = require('child_process');
+const util = require('util');
+
+const exec = util.promisify(cp.exec);
 const root = path.dirname(__dirname);
 const commit = getVersion(root);
 
@@ -116,11 +119,13 @@ function prepareDebPackage(arch) {
  */
 function buildDebPackage(arch) {
 	const debArch = getDebPackageArch(arch);
-	return shell.task([
-		'chmod 755 ' + product.applicationName + '-' + debArch + '/DEBIAN/postinst ' + product.applicationName + '-' + debArch + '/DEBIAN/prerm ' + product.applicationName + '-' + debArch + '/DEBIAN/postrm',
-		'mkdir -p deb',
-		'fakeroot dpkg-deb -b ' + product.applicationName + '-' + debArch + ' deb'
-	], { cwd: '.build/linux/deb/' + debArch });
+	const cwd = `.build/linux/deb/${debArch}`;
+
+	return async () => {
+		await exec(`chmod 755 ${product.applicationName}-${debArch}/DEBIAN/postinst ${product.applicationName}-${debArch}/DEBIAN/prerm ${product.applicationName}-${debArch}/DEBIAN/postrm`, { cwd });
+		await exec('mkdir -p deb', { cwd });
+		await exec(`fakeroot dpkg-deb -b ${product.applicationName}-${debArch} deb`, { cwd });
+	};
 }
 
 /**
@@ -218,14 +223,14 @@ function prepareRpmPackage(arch) {
 function buildRpmPackage(arch) {
 	const rpmArch = getRpmPackageArch(arch);
 	const rpmBuildPath = getRpmBuildPath(rpmArch);
-	const rpmOut = rpmBuildPath + '/RPMS/' + rpmArch;
-	const destination = '.build/linux/rpm/' + rpmArch;
-
-	return shell.task([
-		'mkdir -p ' + destination,
-		'HOME="$(pwd)/' + destination + '" rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch,
-		'cp "' + rpmOut + '/$(ls ' + rpmOut + ')" ' + destination + '/'
-	]);
+	const rpmOut = `${rpmBuildPath}/RPMS/${rpmArch}`;
+	const destination = `.build/linux/rpm/${rpmArch}`;
+
+	return async () => {
+		await exec(`mkdir -p ${destination}`);
+		await exec(`HOME="$(pwd)/${destination}" rpmbuild -bb ${rpmBuildPath}/SPECS/${product.applicationName}.spec --target=${rpmArch}`);
+		await exec(`cp "${rpmOut}/$(ls ${rpmOut})" ${destination}/`);
+	};
 }
 
 /**
@@ -286,9 +291,8 @@ function prepareSnapPackage(arch) {
  * @param {string} arch
  */
 function buildSnapPackage(arch) {
-	const snapBuildPath = getSnapBuildPath(arch);
-	// Default target for snapcraft runs: pull, build, stage and prime, and finally assembles the snap.
-	return shell.task(`cd ${snapBuildPath} && snapcraft`);
+	const cwd = getSnapBuildPath(arch);
+	return () => exec('snapcraft', { cwd });
 }
 
 const BUILD_TARGETS = [
@@ -299,18 +303,18 @@ const BUILD_TARGETS = [
 
 BUILD_TARGETS.forEach(({ arch }) => {
 	const debArch = getDebPackageArch(arch);
-	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
 	gulp.task(prepareDebTask);
 	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
 	gulp.task(buildDebTask);
 
 	const rpmArch = getRpmPackageArch(arch);
-	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
 	gulp.task(prepareRpmTask);
 	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
 	gulp.task(buildRpmTask);
 
-	const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
+	const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
 	gulp.task(prepareSnapTask);
 	const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
 	gulp.task(buildSnapTask);

build/lib/stylelint/vscode-known-variables.json

@@ -128,11 +128,11 @@
 		"--vscode-dropdown-listBackground",
 		"--vscode-editor-background",
 		"--vscode-editor-findMatchBackground",
-		"--vscode-editor-findMatchForeground",
 		"--vscode-editor-findMatchBorder",
+		"--vscode-editor-findMatchForeground",
 		"--vscode-editor-findMatchHighlightBackground",
-		"--vscode-editor-findMatchHighlightForeground",
 		"--vscode-editor-findMatchHighlightBorder",
+		"--vscode-editor-findMatchHighlightForeground",
 		"--vscode-editor-findRangeHighlightBackground",
 		"--vscode-editor-findRangeHighlightBorder",
 		"--vscode-editor-focusedStackFrameHighlightBackground",
@@ -145,6 +145,7 @@
 		"--vscode-editor-lineHighlightBackground",
 		"--vscode-editor-lineHighlightBorder",
 		"--vscode-editor-linkedEditingBackground",
+		"--vscode-editor-placeholder-foreground",
 		"--vscode-editor-rangeHighlightBackground",
 		"--vscode-editor-rangeHighlightBorder",
 		"--vscode-editor-selectionBackground",
@@ -490,12 +491,12 @@
 		"--vscode-panelSectionHeader-background",
 		"--vscode-panelSectionHeader-border",
 		"--vscode-panelSectionHeader-foreground",
-		"--vscode-panelTitle-activeBorder",
-		"--vscode-panelTitle-activeForeground",
-		"--vscode-panelTitle-inactiveForeground",
 		"--vscode-panelStickyScroll-background",
 		"--vscode-panelStickyScroll-border",
 		"--vscode-panelStickyScroll-shadow",
+		"--vscode-panelTitle-activeBorder",
+		"--vscode-panelTitle-activeForeground",
+		"--vscode-panelTitle-inactiveForeground",
 		"--vscode-peekView-border",
 		"--vscode-peekViewEditor-background",
 		"--vscode-peekViewEditor-matchHighlightBackground",
@@ -519,6 +520,7 @@
 		"--vscode-problemsWarningIcon-foreground",
 		"--vscode-profileBadge-background",
 		"--vscode-profileBadge-foreground",
+		"--vscode-profiles-sashBorder",
 		"--vscode-progressBar-background",
 		"--vscode-quickInput-background",
 		"--vscode-quickInput-foreground",
@@ -570,11 +572,11 @@
 		"--vscode-sideBarSectionHeader-background",
 		"--vscode-sideBarSectionHeader-border",
 		"--vscode-sideBarSectionHeader-foreground",
-		"--vscode-sideBarTitle-background",
-		"--vscode-sideBarTitle-foreground",
 		"--vscode-sideBarStickyScroll-background",
 		"--vscode-sideBarStickyScroll-border",
 		"--vscode-sideBarStickyScroll-shadow",
+		"--vscode-sideBarTitle-background",
+		"--vscode-sideBarTitle-foreground",
 		"--vscode-sideBySideEditor-horizontalBorder",
 		"--vscode-sideBySideEditor-verticalBorder",
 		"--vscode-simpleFindWidget-sashBorder",
@@ -649,9 +651,6 @@
 		"--vscode-tab-activeBackground",
 		"--vscode-tab-activeBorder",
 		"--vscode-tab-activeBorderTop",
-		"--vscode-tab-selectedBorderTop",
-		"--vscode-tab-selectedBackground",
-		"--vscode-tab-selectedForeground",
 		"--vscode-tab-activeForeground",
 		"--vscode-tab-activeModifiedBorder",
 		"--vscode-tab-border",
@@ -663,6 +662,9 @@
 		"--vscode-tab-inactiveForeground",
 		"--vscode-tab-inactiveModifiedBorder",
 		"--vscode-tab-lastPinnedBorder",
+		"--vscode-tab-selectedBackground",
+		"--vscode-tab-selectedBorderTop",
+		"--vscode-tab-selectedForeground",
 		"--vscode-tab-unfocusedActiveBackground",
 		"--vscode-tab-unfocusedActiveBorder",
 		"--vscode-tab-unfocusedActiveBorderTop",
@@ -700,10 +702,10 @@
 		"--vscode-terminal-foreground",
 		"--vscode-terminal-hoverHighlightBackground",
 		"--vscode-terminal-inactiveSelectionBackground",
+		"--vscode-terminal-initialHintForeground",
 		"--vscode-terminal-selectionBackground",
 		"--vscode-terminal-selectionForeground",
 		"--vscode-terminal-tab-activeBorder",
-		"--vscode-terminal-initialHintForeground",
 		"--vscode-terminalCommandDecoration-defaultBackground",
 		"--vscode-terminalCommandDecoration-errorBackground",
 		"--vscode-terminalCommandDecoration-successBackground",
@@ -853,4 +855,4 @@
 		"--zoom-factor",
 		"--test-bar-width"
 	]
-}
+}

build/package.json

@@ -44,7 +44,6 @@
     "esbuild": "0.20.0",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",
-    "gulp-shell": "^0.8.0",
     "jsonc-parser": "^2.3.0",
     "mime": "^1.4.1",
     "mkdirp": "^1.0.4",