Merge branch 'main' into current-swordtail

Author: mjbvz

.github/commands.json

@@ -596,13 +596,22 @@
 		"reason": "not_planned",
 		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253126. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
 	},
-		{
+	{
 		"type": "label",
 		"name": "~chat-billing",
 		"removeLabel": "~chat-billing",
 		"addLabel":"chat-billing",
 		"action": "close",
 		"reason": "not_planned",
 		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/252230. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-infinite-response-loop",
+		"removeLabel": "~chat-infinite-response-loop",
+		"addLabel":"chat-infinite-response-loop",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253134. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
 	}
 ]

build/gulpfile.vscode.js

@@ -213,7 +213,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 	const destination = path.join(path.dirname(root), destinationFolderName);
 	platform = platform || process.platform;
 
-	return () => {
+	const task = () => {
 		const electron = require('@vscode/gulp-electron');
 		const json = require('gulp-json-editor');
 
@@ -422,6 +422,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 		return result.pipe(vfs.dest(destination));
 	};
+	task.taskName = `package-${platform}-${arch}`;
+	return task;
 }
 
 function patchWin32DependenciesTask(destinationFolderName) {

extensions/git/src/commands.ts

@@ -2247,8 +2247,8 @@ export class CommandCenter {
 
 		const messageWarning = !discardUntrackedChangesToTrash
 			? resources.length === 1
-				? '\n\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.'
-				: '\n\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.'
+				? '\n\n' + l10n.t('This is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.')
+				: '\n\n' + l10n.t('This is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.')
 			: '';
 
 		const message = resources.length === 1
@@ -2258,11 +2258,11 @@ export class CommandCenter {
 		const messageDetail = discardUntrackedChangesToTrash
 			? isWindows
 				? resources.length === 1
-					? 'You can restore this file from the Recycle Bin.'
-					: 'You can restore these files from the Recycle Bin.'
+					? l10n.t('You can restore this file from the Recycle Bin.')
+					: l10n.t('You can restore these files from the Recycle Bin.')
 				: resources.length === 1
-					? 'You can restore this file from the Trash.'
-					: 'You can restore these files from the Trash.'
+					? l10n.t('You can restore this file from the Trash.')
+					: l10n.t('You can restore these files from the Trash.')
 			: '';
 
 		const primaryAction = discardUntrackedChangesToTrash

extensions/go/cgmanifest.json

@@ -6,12 +6,12 @@
 				"git": {
 					"name": "go-syntax",
 					"repositoryUrl": "https://github.com/worlpaker/go-syntax",
-					"commitHash": "0ce19cdf1cb5dab6aa99ccc933be9bd21e855ed1"
+					"commitHash": "8c70c078f56d237f72574ce49cc95839c4f8a741"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
-			"version": "0.8.1"
+			"version": "0.8.4"
 		}
 	],
 	"version": 1