Polish configure prompt files dialog (microsoft#250325)

* Polish comfigure prompt files dialog

* add rename

Author: aeschli

extensions/prompt-basics/snippets/prompt.code-snippets

@@ -3,7 +3,7 @@
 		"prefix": "New Reusable Chat Prompt",
 		"body": [
 			"---",
-			"mode: '${1|ask,edit,agent|}'",
+			"mode: ${1|ask,edit,agent|}",
 			"---",
 			"${2:Expected output and any relevant constraints for this task.}",
 		],

src/vs/workbench/contrib/chat/browser/actions/promptActions/chatAttachInstructionsAction.ts

@@ -40,9 +40,9 @@ import { IOpenerService } from '../../../../../../platform/opener/common/opener.
 const ATTACH_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.attach.instructions';
 
 /**
- * Action ID for the `Manage Instruction` action.
+ * Action ID for the `Configure Instruction` action.
  */
-const MANAGE_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.manage.instructions';
+const CONFIGURE_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.configure.instructions';
 
 
 /**
@@ -156,8 +156,8 @@ class AttachInstructionsAction extends Action2 {
 class ManageInstructionsFilesAction extends Action2 {
 	constructor() {
 		super({
-			id: MANAGE_INSTRUCTIONS_ACTION_ID,
-			title: localize2('manage-instructions.capitalized.ellipses', "Manage Instructions Files..."),
+			id: CONFIGURE_INSTRUCTIONS_ACTION_ID,
+			title: localize2('configure-instructions', "Configure Instructions"),
 			icon: Codicon.bookmark,
 			f1: true,
 			precondition: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),
@@ -183,7 +183,7 @@ class ManageInstructionsFilesAction extends Action2 {
 
 		const placeholder = localize(
 			'commands.prompt.manage-dialog.placeholder',
-			'Select the instructions file to edit'
+			'Select the instructions file to open'
 		);
 
 		const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.instructions, optionEdit: false });

src/vs/workbench/contrib/chat/browser/actions/promptActions/chatModeActions.ts

@@ -17,16 +17,16 @@ import { PromptsType } from '../../../../../../platform/prompts/common/prompts.j
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
 
 /**
- * Action ID for the `Manage Custom Chat Mode` action.
+ * Action ID for the `Configure Custom Chat Mode` action.
  */
-const MANAGE_CUSTOM_MODE_ACTION_ID = 'workbench.action.chat.manage.mode';
+const COMFIGURE_MODES_ACTION_ID = 'workbench.action.chat.manage.mode';
 
 class ManageModeAction extends Action2 {
 	constructor() {
 		super({
-			id: MANAGE_CUSTOM_MODE_ACTION_ID,
-			title: localize2('manage-mode.capitalized', "Manage Chat Modes..."),
-			shortTitle: localize('manage-mode', "Manage Modes..."),
+			id: COMFIGURE_MODES_ACTION_ID,
+			title: localize2('configure-modes', "Configure Chat Modes"),
+			shortTitle: localize('manage-mode', "Configure Modes"),
 			icon: Codicon.bookmark,
 			f1: true,
 			precondition: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),
@@ -50,7 +50,7 @@ class ManageModeAction extends Action2 {
 
 		const placeholder = localize(
 			'commands.mode.select-dialog.placeholder',
-			'Select the custom chat mode to edit'
+			'Select the chat mode file to open'
 		);
 
 		const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.mode, optionEdit: false });

src/vs/workbench/contrib/chat/browser/actions/promptActions/chatRunPromptAction.ts

@@ -57,9 +57,9 @@ const RUN_CURRENT_PROMPT_ACTION_ID = 'workbench.action.chat.run.prompt.current';
 const RUN_SELECTED_PROMPT_ACTION_ID = 'workbench.action.chat.run.prompt';
 
 /**
- * Action ID for the `Manage Prompt Files...` action.
+ * Action ID for the `Configure Prompt Files...` action.
  */
-const MANAGE_SELECTED_PROMPT_ACTION_ID = 'workbench.action.chat.manage.prompts';
+const CONFIGURE_PROMPTS_ACTION_ID = 'workbench.action.chat.configure.prompts';
 
 /**
  * Constructor options for the `Run Prompt` base action.
@@ -241,8 +241,8 @@ class RunSelectedPromptAction extends Action2 {
 class ManagePromptFilesAction extends Action2 {
 	constructor() {
 		super({
-			id: MANAGE_SELECTED_PROMPT_ACTION_ID,
-			title: localize2('manage-prompts.capitalized.ellipses', "Manage Prompt Files..."),
+			id: CONFIGURE_PROMPTS_ACTION_ID,
+			title: localize2('configure-prompts', "Configure Prompt Files"),
 			icon: Codicon.bookmark,
 			f1: true,
 			precondition: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),

src/vs/workbench/contrib/chat/browser/actions/promptActions/dialogs/askToSelectPrompt/promptFilePickers.ts

@@ -24,6 +24,8 @@ import { askForPromptFileName } from '../../../../promptSyntax/contributions/cre
 import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
 import { CancellationToken } from '../../../../../../../../base/common/cancellation.js';
 import { askForPromptSourceFolder } from '../../../../promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.js';
+import { UILabelProvider } from '../../../../../../../../base/common/keybindingLabels.js';
+import { OS } from '../../../../../../../../base/common/platform.js';
 
 /**
  * Options for the {@link askToSelectInstructions} function.
@@ -48,7 +50,7 @@ export interface ISelectOptions {
 	readonly optionEdit?: boolean;
 	readonly optionDelete?: boolean;
 	readonly optionRename?: boolean;
-	readonly optionMove?: boolean;
+	readonly optionCopy?: boolean;
 }
 
 export interface ISelectPromptResult {
@@ -153,14 +155,14 @@ const DELETE_BUTTON: IQuickInputButton = Object.freeze({
  */
 const RENAME_BUTTON: IQuickInputButton = Object.freeze({
 	tooltip: localize('rename', "Rename"),
-	iconClass: ThemeIcon.asClassName(Codicon.pencil),
+	iconClass: ThemeIcon.asClassName(Codicon.replace),
 });
 
 /**
  * Button that copies a prompt file.
  */
 const COPY_BUTTON: IQuickInputButton = Object.freeze({
-	tooltip: localize('copy', "Copy"),
+	tooltip: localize('copy', "Copy or Move (press {0})", UILabelProvider.modifierLabels[OS].ctrlKey),
 	iconClass: ThemeIcon.asClassName(Codicon.copy),
 });
 
@@ -186,7 +188,7 @@ export class PromptFilePickers {
 	async selectPromptFile(options: ISelectOptions): Promise<ISelectPromptResult | undefined> {
 		const quickPick = this._quickInputService.createQuickPick<IPromptPickerQuickPickItem>();
 		quickPick.busy = true;
-		quickPick.placeholder = localize('searching', 'Searching for files...');
+		quickPick.placeholder = localize('searching', 'Searching file system...');
 		try {
 			const fileOptions = await this._createPromptPickItems(options);
 			const activeItem = options.resource && fileOptions.find(f => extUri.isEqual(f.value, options.resource));
@@ -260,12 +262,12 @@ export class PromptFilePickers {
 		if (options.optionEdit !== false) {
 			buttons.push(EDIT_BUTTON);
 		}
+		if (options.optionCopy !== false) {
+			buttons.push(COPY_BUTTON);
+		}
 		if (options.optionRename !== false) {
 			buttons.push(RENAME_BUTTON);
 		}
-		if (options.optionMove !== false) {
-			buttons.push(COPY_BUTTON);
-		}
 		if (options.optionDelete !== false) {
 			buttons.push(DELETE_BUTTON);
 		}
@@ -380,7 +382,8 @@ export class PromptFilePickers {
 		// `copy` button was pressed, open the prompt file in editor
 		if (button === COPY_BUTTON) {
 			const currentFolder = dirname(value);
-			const newFolder = await this._instaService.invokeFunction(askForPromptSourceFolder, options.type, currentFolder);
+			const isMove = quickPick.keyMods.ctrlCmd;
+			const newFolder = await this._instaService.invokeFunction(askForPromptSourceFolder, options.type, currentFolder, isMove);
 			if (!newFolder) {
 				return;
 			}
@@ -389,7 +392,12 @@ export class PromptFilePickers {
 				return;
 			}
 			const newFile = joinPath(newFolder.uri, newName);
-			await this._fileService.copy(value, newFile);
+			if (isMove) {
+				await this._fileService.move(value, newFile);
+			} else {
+				await this._fileService.copy(value, newFile);
+			}
+
 			await this._openerService.open(newFile);
 
 			return;

src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts

@@ -27,6 +27,7 @@ export async function askForPromptSourceFolder(
 	accessor: ServicesAccessor,
 	type: PromptsType,
 	existingFolder?: URI | undefined,
+	isMove: boolean = false,
 ): Promise<IPromptPath | undefined> {
 	const quickInputService = accessor.get(IQuickInputService);
 	const promptsService = accessor.get(IPromptsService);
@@ -50,7 +51,7 @@ export async function askForPromptSourceFolder(
 	}
 
 	const pickOptions: IPickOptions<IFolderQuickPickItem> = {
-		placeHolder: existingFolder ? getPlaceholderStringforMove(type) : getPlaceholderStringforNew(type),
+		placeHolder: existingFolder ? getPlaceholderStringforMove(type, isMove) : getPlaceholderStringforNew(type),
 		canPickMany: false,
 		matchOnDescription: true,
 	};
@@ -128,14 +129,26 @@ function getPlaceholderStringforNew(type: PromptsType): string {
 	}
 }
 
-function getPlaceholderStringforMove(type: PromptsType): string {
+function getPlaceholderStringforMove(type: PromptsType, isMove: boolean): string {
+	if (isMove) {
+		switch (type) {
+			case PromptsType.instructions:
+				return localize('instructions.move.location.placeholder', "Select a location to move the instructions file to...");
+			case PromptsType.prompt:
+				return localize('prompt.move.location.placeholder', "Select a location to move the prompt file to...");
+			case PromptsType.mode:
+				return localize('mode.move.location.placeholder', "Select a location to move the mode file to...");
+			default:
+				throw new Error('Unknown prompt type');
+		}
+	}
 	switch (type) {
 		case PromptsType.instructions:
-			return localize('workbench.command.instructions.move.location.placeholder', "Select a location to move the instructions file to...");
+			return localize('instructions.copy.location.placeholder', "Select a location to copy the instructions file to...");
 		case PromptsType.prompt:
-			return localize('workbench.command.prompt.move.location.placeholder', "Select a location to move the prompt file to...");
+			return localize('prompt.copy.location.placeholder', "Select a location to copy the prompt file to...");
 		case PromptsType.mode:
-			return localize('workbench.command.mode.move.location.placeholder', "Select a location to move the mode file to...");
+			return localize('mode.copy.location.placeholder', "Select a location to copy the mode file to...");
 		default:
 			throw new Error('Unknown prompt type');
 	}