[pull] main from microsoft:main

.vscode/settings.json

@@ -7,6 +7,7 @@
 		"scripts/test-integration.bat": true,
 		"scripts/test-integration.sh": true,
 	},
+	"chat.viewSessions.enabled": true,
 
 	// --- Editor ---
 	"editor.insertSpaces": false,

extensions/extension-editing/src/extensionLinter.ts

@@ -33,7 +33,7 @@ const dataUrlsNotValid = l10n.t("Data URLs are not a valid image source.");
 const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a repository with HTTPS protocol to be specified in the package.json.");
 const relativeBadgeUrlRequiresHttpsRepository = l10n.t("Relative badge URLs require a repository with HTTPS protocol to be specified in this package.json.");
 const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the VS Code team.");
-const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75.0 as VS Code will generate these automatically from your package.json contribution declarations.");
+
 const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
 const parsingErrorHeader = l10n.t("Error parsing the when-clause:");
 
@@ -162,13 +162,12 @@ export class ExtensionLinter {
 				if (activationEventsNode?.type === 'array' && activationEventsNode.children) {
 					for (const activationEventNode of activationEventsNode.children) {
 						const activationEvent = getNodeValue(activationEventNode);
-						const isImplicitActivationSupported = info.engineVersion && info.engineVersion?.majorBase >= 1 && info.engineVersion?.minorBase >= 75;
+						const isImplicitActivationSupported = info.engineVersion && (info.engineVersion.majorBase > 1 || (info.engineVersion.majorBase === 1 && info.engineVersion.minorBase >= 75));
 						// Redundant Implicit Activation
-						if (info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
+						if (isImplicitActivationSupported && info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
 							const start = document.positionAt(activationEventNode.offset);
 							const end = document.positionAt(activationEventNode.offset + activationEventNode.length);
-							const message = isImplicitActivationSupported ? redundantImplicitActivationEvent : bumpEngineForImplicitActivationEvents;
-							diagnostics.push(new Diagnostic(new Range(start, end), message, isImplicitActivationSupported ? DiagnosticSeverity.Warning : DiagnosticSeverity.Information));
+							diagnostics.push(new Diagnostic(new Range(start, end), redundantImplicitActivationEvent, DiagnosticSeverity.Warning));
 						}
 
 						// Reserved Implicit Activation

extensions/git/src/repository.ts

@@ -1928,36 +1928,26 @@ export class Repository implements Disposable {
 
 		try {
 			// Copy files
-			let copiedFiles = 0;
-			const results = await window.withProgress({
-				location: ProgressLocation.Notification,
-				title: l10n.t('Copying additional files to the worktree'),
-				cancellable: false
-			}, async (progress) => {
-				const limiter = new Limiter<void>(10);
-				const files = Array.from(ignoredFiles);
-
-				return Promise.allSettled(files.map(sourceFile =>
-					limiter.queue(async () => {
-						const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
-						await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
-						await fsPromises.cp(sourceFile, targetFile, {
-							force: true,
-							recursive: false,
-							verbatimSymlinks: true
-						});
-
-						copiedFiles++;
-						progress.report({
-							increment: 100 / ignoredFiles.size,
-							message: l10n.t('({0}/{1})', copiedFiles, ignoredFiles.size)
-						});
-					})
-				));
-			});
+			const startTime = Date.now();
+			const limiter = new Limiter<void>(15);
+			const files = Array.from(ignoredFiles);
+
+			const results = await Promise.allSettled(files.map(sourceFile =>
+				limiter.queue(async () => {
+					const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
+					await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
+					await fsPromises.cp(sourceFile, targetFile, {
+						force: true,
+						mode: fs.constants.COPYFILE_FICLONE,
+						recursive: false,
+						verbatimSymlinks: true
+					});
+				})
+			));
 
 			// Log any failed operations
 			const failedOperations = results.filter(r => r.status === 'rejected');
+			this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length} files to worktree. Failed to copy ${failedOperations.length} files. [${Date.now() - startTime}ms]`);
 
 			if (failedOperations.length > 0) {
 				window.showWarningMessage(l10n.t('Failed to copy {0} files to the worktree.', failedOperations.length));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.109.0",
-  "distro": "f44449f84806363760ce8bb8dbe85cd8207498ff",
+  "distro": "b90415e4e25274537a83463c7af88fca7e9528a7",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -91,16 +91,16 @@
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "^0.3.0-beta.101",
-    "@xterm/addon-image": "^0.10.0-beta.101",
-    "@xterm/addon-ligatures": "^0.11.0-beta.101",
-    "@xterm/addon-progress": "^0.3.0-beta.101",
-    "@xterm/addon-search": "^0.17.0-beta.101",
-    "@xterm/addon-serialize": "^0.15.0-beta.101",
-    "@xterm/addon-unicode11": "^0.10.0-beta.101",
-    "@xterm/addon-webgl": "^0.20.0-beta.100",
-    "@xterm/headless": "^6.1.0-beta.101",
-    "@xterm/xterm": "^6.1.0-beta.101",
+    "@xterm/addon-clipboard": "^0.3.0-beta.102",
+    "@xterm/addon-image": "^0.10.0-beta.102",
+    "@xterm/addon-ligatures": "^0.11.0-beta.102",
+    "@xterm/addon-progress": "^0.3.0-beta.102",
+    "@xterm/addon-search": "^0.17.0-beta.102",
+    "@xterm/addon-serialize": "^0.15.0-beta.102",
+    "@xterm/addon-unicode11": "^0.10.0-beta.102",
+    "@xterm/addon-webgl": "^0.20.0-beta.101",
+    "@xterm/headless": "^6.1.0-beta.102",
+    "@xterm/xterm": "^6.1.0-beta.102",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",