[pull] main from microsoft:main

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

@@ -312,10 +312,10 @@ export class DarwinTestRunner extends PosixTestRunner {
 
 	/** @override */
 	protected override async binaryPath() {
-		const { nameLong } = await this.readProductJson();
+		const { nameLong, nameShort } = await this.readProductJson();
 		return path.join(
 			this.repoLocation.uri.fsPath,
-			`.build/electron/${nameLong}.app/Contents/MacOS/Electron`
+			`.build/electron/${nameLong}.app/Contents/MacOS/${nameShort}`
 		);
 	}
 }

.vscode/launch.json

@@ -505,7 +505,7 @@
 			"request": "launch",
 			"name": "Run Unit Tests",
 			"program": "${workspaceFolder}/test/unit/electron/index.js",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Code - OSS",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.exe"
 			},
@@ -535,7 +535,7 @@
 			"request": "launch",
 			"name": "Run Unit Tests For Current File",
 			"program": "${workspaceFolder}/test/unit/electron/index.js",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Code - OSS",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.exe"
 			},
@@ -571,7 +571,7 @@
 			"timeout": 240000,
 			"args": [
 				"-l",
-				"${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron"
+				"${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Code - OSS"
 			],
 			"outFiles": [
 				"${cwd}/out/**/*.js"

build/azure-pipelines/darwin/product-build-darwin-universal.yml

@@ -98,6 +98,20 @@ jobs:
           DEBUG=* node build/darwin/create-universal-app.ts $(agent.builddirectory)
         displayName: Create Universal App
 
+      - script: |
+          set -e
+          APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+          APP_NAME="`ls $APP_ROOT | head -n 1`"
+          APP_PATH="$APP_ROOT/$APP_NAME"
+          EXEC_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").nameShort")
+          # Create a symlink from 'Electron' to the actual executable for backward compatibility
+          # This ensures apps that relied on the hardcoded path 'Contents/MacOS/Electron' continue to work
+          # Remove this step once main branch is on 1.112 release.
+          if [ "$EXEC_NAME" != "Electron" ] && [ ! -L "$APP_PATH/Contents/MacOS/Electron" ]; then
+            ln -s "$EXEC_NAME" "$APP_PATH/Contents/MacOS/Electron"
+          fi
+        displayName: Create Electron symlink for backward compatibility
+
       - script: |
           set -e
           APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"

build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml

@@ -166,6 +166,21 @@ steps:
         chmod +x "$APP_PATH/Contents/Resources/app/bin/$CLI_APP_NAME"
       displayName: Make CLI executable
 
+    - script: |
+        set -e
+        APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+        APP_NAME="`ls $APP_ROOT | head -n 1`"
+        APP_PATH="$APP_ROOT/$APP_NAME"
+        EXEC_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").nameShort")
+        # Create a symlink from 'Electron' to the actual executable for backward compatibility
+        # This ensures apps that relied on the hardcoded path 'Contents/MacOS/Electron' continue to work
+        # Remove this step once main branch is on 1.112 release.
+        if [ "$EXEC_NAME" != "Electron" ] && [ ! -L "$APP_PATH/Contents/MacOS/Electron" ]; then
+          ln -s "$EXEC_NAME" "$APP_PATH/Contents/MacOS/Electron"
+        fi
+      condition: eq(variables['BUILT_CLIENT'], 'true')
+      displayName: Create Electron symlink for backward compatibility
+
     - script: |
         set -e
         APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"

build/azure-pipelines/darwin/steps/product-build-darwin-test.yml

@@ -58,7 +58,9 @@ steps:
         set -e
         APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
         APP_NAME="`ls $APP_ROOT | head -n 1`"
-        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+        ProductJsonPath=$(find "$APP_ROOT" -name "product.json" -type f | head -n 1)
+        BINARY_NAME=$(jq -r '.nameShort' "$ProductJsonPath")
+        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/$BINARY_NAME" \
         ./scripts/test-integration.sh --build --tfs "Integration Tests"
       env:
         VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
@@ -77,7 +79,9 @@ steps:
         set -e
         APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
         APP_NAME="`ls $APP_ROOT | head -n 1`"
-        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+        ProductJsonPath=$(find "$APP_ROOT" -name "product.json" -type f | head -n 1)
+        BINARY_NAME=$(jq -r '.nameShort' "$ProductJsonPath")
+        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/$BINARY_NAME" \
         ./scripts/test-remote-integration.sh
       env:
         VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)

build/gulpfile.extensions.ts

@@ -7,21 +7,22 @@
 import { EventEmitter } from 'events';
 EventEmitter.defaultMaxListeners = 100;
 
+import es from 'event-stream';
+import glob from 'glob';
 import gulp from 'gulp';
+import filter from 'gulp-filter';
+import plumber from 'gulp-plumber';
+import sourcemaps from 'gulp-sourcemaps';
 import * as path from 'path';
 import * as nodeUtil from 'util';
-import es from 'event-stream';
-import filter from 'gulp-filter';
-import * as util from './lib/util.ts';
+import * as ext from './lib/extensions.ts';
 import { getVersion } from './lib/getVersion.ts';
-import * as task from './lib/task.ts';
-import watcher from './lib/watch/index.ts';
 import { createReporter } from './lib/reporter.ts';
-import glob from 'glob';
-import plumber from 'gulp-plumber';
-import * as ext from './lib/extensions.ts';
+import * as task from './lib/task.ts';
 import * as tsb from './lib/tsb/index.ts';
-import sourcemaps from 'gulp-sourcemaps';
+import { createTsgoStream, spawnTsgo } from './lib/tsgo.ts';
+import * as util from './lib/util.ts';
+import watcher from './lib/watch/index.ts';
 
 const root = path.dirname(import.meta.dirname);
 const commit = getVersion(root);
@@ -78,6 +79,18 @@ const compilations = [
 
 const getBaseUrl = (out: string) => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
 
+function rewriteTsgoSourceMappingUrlsIfNeeded(build: boolean, out: string, baseUrl: string): Promise<void> {
+	if (!build) {
+		return Promise.resolve();
+	}
+
+	return util.streamToPromise(
+		gulp.src(path.join(out, '**', '*.js'), { base: out })
+			.pipe(util.rewriteSourceMappingURL(baseUrl))
+			.pipe(gulp.dest(out))
+	);
+}
+
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(root, tsconfigFile);
 	const relativeDirname = path.dirname(tsconfigFile.replace(/^(.*\/)?extensions\//i, ''));
@@ -150,25 +163,22 @@ const tasks = compilations.map(function (tsconfigFile) {
 			.pipe(gulp.dest(out));
 	}));
 
-	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false, true);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
+	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, async () => {
+		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts'], { dot: true }));
+		const copyNonTs = util.streamToPromise(nonts.pipe(gulp.dest(out)));
+		const tsgo = spawnTsgo(absolutePath, () => rewriteTsgoSourceMappingUrlsIfNeeded(false, out, baseUrl));
 
-		return input
-			.pipe(pipeline())
-			.pipe(gulp.dest(out));
+		await Promise.all([copyNonTs, tsgo]);
 	}));
 
 	const watchTask = task.define(`watch-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
+		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts'], { dot: true }));
 		const watchInput = watcher(src, { ...srcOpts, ...{ readDelay: 200 } });
+		const watchNonTs = watchInput.pipe(filter(['**', '!**/*.ts'], { dot: true })).pipe(gulp.dest(out));
+		const tsgoStream = watchInput.pipe(util.debounce(() => createTsgoStream(absolutePath, () => rewriteTsgoSourceMappingUrlsIfNeeded(false, out, baseUrl)), 200));
+		const watchStream = es.merge(nonts.pipe(gulp.dest(out)), watchNonTs, tsgoStream);
 
-		return watchInput
-			.pipe(util.incremental(pipeline, input))
-			.pipe(gulp.dest(out));
+		return watchStream;
 	}));
 
 	// Tasks

build/gulpfile.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { EventEmitter } from 'events';
+EventEmitter.defaultMaxListeners = 100;
+
 import glob from 'glob';
 import gulp from 'gulp';
 import { createRequire } from 'node:module';
@@ -12,29 +14,25 @@ import * as compilation from './lib/compilation.ts';
 import * as task from './lib/task.ts';
 import * as util from './lib/util.ts';
 
-EventEmitter.defaultMaxListeners = 100;
-
 const require = createRequire(import.meta.url);
 
-const { transpileTask, compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = compilation;
-
 // API proposal names
-gulp.task(compileApiProposalNamesTask);
-gulp.task(watchApiProposalNamesTask);
+gulp.task(compilation.compileApiProposalNamesTask);
+gulp.task(compilation.watchApiProposalNamesTask);
 
 // SWC Client Transpile
-const transpileClientSWCTask = task.define('transpile-client-esbuild', task.series(util.rimraf('out'), transpileTask('src', 'out', true)));
+const transpileClientSWCTask = task.define('transpile-client-esbuild', task.series(util.rimraf('out'), compilation.transpileTask('src', 'out', true)));
 gulp.task(transpileClientSWCTask);
 
 // Transpile only
-const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), transpileTask('src', 'out')));
+const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), compilation.transpileTask('src', 'out')));
 gulp.task(transpileClientTask);
 
 // Fast compile for development time
-const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.copyCodiconsTask, compileApiProposalNamesTask, compileTask('src', 'out', false)));
+const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.copyCodiconsTask, compilation.compileApiProposalNamesTask, compilation.compileTask('src', 'out', false)));
 gulp.task(compileClientTask);
 
-const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask, compilation.watchCodiconsTask)));
+const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), task.parallel(compilation.watchTask('out', false), compilation.watchApiProposalNamesTask, compilation.watchCodiconsTask)));
 gulp.task(watchClientTask);
 
 // All

build/gulpfile.vscode.ts

@@ -364,6 +364,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(replace('@@NAME@@', product.nameShort))
 				.pipe(rename('bin/code'));
 			const policyDest = gulp.src('.build/policies/darwin/**', { base: '.build/policies/darwin' })
 				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));

build/lib/electron.ts

@@ -109,6 +109,7 @@ export const config = {
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2026 Microsoft. All rights reserved',
+	darwinExecutable: product.nameShort,
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',

build/lib/tsgo.ts

@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import es from 'event-stream';
+import * as path from 'path';
+import { createReporter } from './reporter.ts';
+
+const root = path.dirname(path.dirname(import.meta.dirname));
+const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+const ansiRegex = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+
+export function spawnTsgo(projectPath: string, onComplete?: () => Promise<void> | void): Promise<void> {
+	const reporter = createReporter('extensions');
+	let report: NodeJS.ReadWriteStream | undefined;
+
+	const beginReport = (emitError: boolean) => {
+		if (report) {
+			report.end();
+		}
+		report = reporter.end(emitError);
+	};
+
+	const endReport = () => {
+		if (!report) {
+			return;
+		}
+		report.end();
+		report = undefined;
+	};
+
+	const args = ['tsgo', '--project', projectPath, '--pretty', 'false', '--sourceMap', '--inlineSources'];
+
+	beginReport(false);
+
+	const child = cp.spawn(npx, args, {
+		cwd: root,
+		stdio: ['ignore', 'pipe', 'pipe'],
+		shell: true
+	});
+
+	let buffer = '';
+	const handleLine = (line: string) => {
+		const trimmed = line.replace(ansiRegex, '').trim();
+		if (!trimmed) {
+			return;
+		}
+		if (/Starting compilation|File change detected/i.test(trimmed)) {
+			beginReport(false);
+			return;
+		}
+		if (/Compilation complete/i.test(trimmed)) {
+			endReport();
+			return;
+		}
+
+		const match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(trimmed);
+
+		if (match) {
+			const fullpath = path.isAbsolute(match[1]) ? match[1] : path.join(root, match[1]);
+			const message = match[3];
+			reporter(fullpath + message);
+		} else {
+			reporter(trimmed);
+		}
+	};
+
+	const handleData = (data: Buffer) => {
+		buffer += data.toString('utf8');
+		const lines = buffer.split(/\r?\n/);
+		buffer = lines.pop() ?? '';
+		for (const line of lines) {
+			handleLine(line);
+		}
+	};
+
+	child.stdout?.on('data', handleData);
+	child.stderr?.on('data', handleData);
+
+	const done = new Promise<void>((resolve, reject) => {
+		child.on('exit', code => {
+			if (buffer.trim()) {
+				handleLine(buffer);
+				buffer = '';
+			}
+			endReport();
+			if (code === 0) {
+				Promise.resolve(onComplete?.()).then(() => resolve(), reject);
+				return;
+			}
+			reject(new Error(`tsgo exited with code ${code ?? 'unknown'}`));
+		});
+		child.on('error', err => {
+			endReport();
+			reject(err);
+		});
+	});
+
+	return done;
+}
+
+export function createTsgoStream(projectPath: string, onComplete?: () => Promise<void> | void): NodeJS.ReadWriteStream {
+	const stream = es.through();
+
+	spawnTsgo(projectPath, onComplete).then(() => {
+		stream.emit('end');
+	}).catch(() => {
+		// Errors are already reported by spawnTsgo via the reporter.
+		// Don't emit 'error' on the stream as that would exit the watch process.
+		stream.emit('end');
+	});
+
+	return stream;
+}

extensions/git-base/src/decorators.ts

@@ -47,11 +47,11 @@ function _throttle<T>(fn: Function, key: string): Function {
 	return trigger;
 }
 
-function decorate(decorator: (fn: Function, key: string) => Function): Function {
-	return function (original: any, context: ClassMethodDecoratorContext) {
-		if (context.kind !== 'method') {
+function decorate(decorator: (fn: Function, key: string) => Function): MethodDecorator {
+	return (_target: any, key: string | symbol, descriptor: PropertyDescriptor): void => {
+		if (typeof descriptor.value !== 'function') {
 			throw new Error('not supported');
 		}
-		return decorator(original, context.name.toString());
+		descriptor.value = decorator(descriptor.value, String(key));
 	};
 }