Merge branch 'microsoft:main' into head-swordfish

Author: kkbrooks

src/vs/platform/quickinput/browser/quickPickPin.ts

@@ -77,7 +77,7 @@ function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPick
 }
 
 function getItemIdentifier(item: QuickPickItem): string {
-	return item.type === 'separator' ? '' : item.id || `${item.label}${item.description}${item.detail}}`;
+	return item.type === 'separator' ? '' : item.id || `${item.label}${item.description}${item.detail}`;
 }
 
 function updateButtons(item: QuickPickItem, removePin: boolean): void {
@@ -107,11 +107,19 @@ function updatePinnedItems(storageKey: string, changedItem: IQuickPickItem, stor
 	} else {
 		items.push(changedItem);
 	}
-	storageService.store(storageKey, JSON.stringify(items), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	storageService.store(storageKey, JSON.stringify(items.map(formatPinnedItemForStorage)), StorageScope.WORKSPACE, StorageTarget.MACHINE);
 	return items;
 }
 
 function getPinnedItems(storageKey: string, storageService: IStorageService): IQuickPickItem[] {
 	const items = storageService.get(storageKey, StorageScope.WORKSPACE);
 	return items ? JSON.parse(items) : [];
 }
+
+function formatPinnedItemForStorage(item: IQuickPickItem): IQuickPickItem {
+	return {
+		label: item.label,
+		description: item.description,
+		detail: item.detail,
+	};
+}

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

@@ -135,7 +135,7 @@ export const terminalSendSequenceCommand = async (accessor: ServicesAccessor, ar
 		if (!text) {
 			text = await quickInputService.input({
 				value: '',
-				placeHolder: 'Enter sequence to send (supports \\n, \\r, \\x{AB})',
+				placeHolder: 'Enter sequence to send (supports \\n, \\r, \\xAB)',
 				prompt: localize('workbench.action.terminal.sendSequence.prompt', "Enter sequence to send to the terminal"),
 			});
 			if (!text) {

src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts

@@ -75,7 +75,7 @@ registerTerminalAction({
 		}
 		const data = await quickInputService.input({
 			value: '',
-			placeHolder: 'Enter data, use \\x to escape',
+			placeHolder: 'Enter data (supports \\n, \\r, \\xAB)',
 			prompt: localize('workbench.action.terminal.writeDataToTerminal.prompt', "Enter data to write directly to the terminal, bypassing the pty"),
 		});
 		if (!data) {