promptFileLocator: Use ISearchService (microsoft#249901)

* promptFIleLocator: Use ISearchService

* polish

Author: aeschli

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

@@ -31,6 +31,7 @@ import { KeyMod, KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICodeEditorService } from '../../../../../../editor/browser/services/codeEditorService.js';
 import { INSTRUCTIONS_LANGUAGE_ID } from '../../../common/promptSyntax/constants.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
 /**
  * Action ID for the `Attach Instruction` action.
@@ -130,7 +131,7 @@ class AttachInstructionsAction extends Action2 {
 		}
 
 		// find all prompt files in the user workspace
-		const promptFiles = await promptsService.listPromptFiles(PromptsType.instructions);
+		const promptFiles = await promptsService.listPromptFiles(PromptsType.instructions, CancellationToken.None);
 		const placeholder = localize(
 			'commands.instructions.select-dialog.placeholder',
 			'Select instructions files to attach',
@@ -202,7 +203,7 @@ export class ChatInstructionsPickerPick implements IChatContextPickerItem {
 
 	asPicker(): { readonly placeholder: string; readonly picks: Promise<ChatContextPick[]> } {
 
-		const picks = this.promptsService.listPromptFiles(PromptsType.instructions).then(value => {
+		const picks = this.promptsService.listPromptFiles(PromptsType.instructions, CancellationToken.None).then(value => {
 
 			const result: (IChatContextPickerPickItem | IQuickPickSeparator)[] = [];
 

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

@@ -16,6 +16,7 @@ import { Action2, MenuId, registerAction2 } from '../../../../../../platform/act
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { PromptsType } from '../../../../../../platform/prompts/common/prompts.js';
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
 /**
  * Action ID for the `Manage Custom Chat Mode` action.
@@ -51,7 +52,7 @@ class ManageModeAction extends Action2 {
 		const pickers = instaService.createInstance(PromptFilePickers);
 
 		// find all prompt files in the user workspace
-		const promptFiles = await promptsService.listPromptFiles(PromptsType.mode);
+		const promptFiles = await promptsService.listPromptFiles(PromptsType.mode, CancellationToken.None);
 		const placeholder = localize(
 			'commands.mode.select-dialog.placeholder',
 			'Select the custom chat mode to edit'

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

@@ -31,6 +31,7 @@ import { KeybindingWeight } from '../../../../../../platform/keybinding/common/k
 import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { PromptsType } from '../../../../../../platform/prompts/common/prompts.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
 /**
  * Condition for the `Run Current Prompt` action.
@@ -209,7 +210,7 @@ class RunSelectedPromptAction extends Action2 {
 		const pickers = instaService.createInstance(PromptFilePickers);
 
 		// find all prompt files in the user workspace
-		const promptFiles = await promptsService.listPromptFiles(PromptsType.prompt);
+		const promptFiles = await promptsService.listPromptFiles(PromptsType.prompt, CancellationToken.None);
 		const placeholder = localize(
 			'commands.prompt.select-dialog.placeholder',
 			'Select the prompt file to run (hold {0}-key to use in new chat)',

src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts

@@ -28,6 +28,7 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import type { IChatPromptSlashCommand, ICustomChatMode, IMetadata, IPromptPath, IPromptsService, TPromptsStorage } from './types.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
 /**
  * Provides prompt services.
@@ -111,13 +112,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 		return this.cache.get(model);
 	}
 
-	public async listPromptFiles(type: PromptsType): Promise<readonly IPromptPath[]> {
-		const userLocations = [this.userDataService.currentProfile.promptsHome];
-
+	public async listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
 		const prompts = await Promise.all([
-			this.fileLocator.listFilesIn(userLocations, type)
+			this.fileLocator.listFiles(type, 'user', token)
 				.then(withType('user', type)),
-			this.fileLocator.listFiles(type)
+			this.fileLocator.listFiles(type, 'local', token)
 				.then(withType('local', type)),
 		]);
 
@@ -160,7 +159,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 			return data.promptPath.uri;
 		}
 
-		const files = await this.listPromptFiles(PromptsType.prompt);
+		const files = await this.listPromptFiles(PromptsType.prompt, CancellationToken.None);
 		const command = data.command;
 		const result = files.find(file => getPromptCommandName(file.uri.path) === command);
 		if (result) {
@@ -174,7 +173,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 	}
 
 	public async findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]> {
-		const promptFiles = await this.listPromptFiles(PromptsType.prompt);
+		const promptFiles = await this.listPromptFiles(PromptsType.prompt, CancellationToken.None);
 		return promptFiles.map(promptPath => {
 			const command = getPromptCommandName(promptPath.uri.path);
 			return {
@@ -190,7 +189,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 	public readonly onDidChangeCustomChatModes: Event<void> = this._onDidChangeCustomChatModesEmitter.event;
 
 	public async getCustomChatModes(): Promise<readonly ICustomChatMode[]> {
-		const modeFiles = await this.listPromptFiles(PromptsType.mode);
+		const modeFiles = await this.listPromptFiles(PromptsType.mode, CancellationToken.None);
 		const metaDatas = await this.getAllMetadata(modeFiles.map(promptPath => promptPath.uri));
 		return metaDatas.map(metadata => {
 			return {
@@ -206,7 +205,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 	public async findInstructionFilesFor(
 		files: readonly URI[],
 	): Promise<readonly URI[]> {
-		const instructionFiles = await this.listPromptFiles(PromptsType.instructions);
+		const instructionFiles = await this.listPromptFiles(PromptsType.instructions, CancellationToken.None);
 		if (instructionFiles.length === 0) {
 			return [];
 		}

src/vs/workbench/contrib/chat/common/promptSyntax/service/types.ts

@@ -13,6 +13,7 @@ import { TextModelPromptParser } from '../parsers/textModelPromptParser.js';
 import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { PromptsType } from '../../../../../../platform/prompts/common/prompts.js';
 import { Event } from '../../../../../../base/common/event.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
 /**
  * Provides prompt services.
@@ -152,7 +153,7 @@ export interface IPromptsService extends IDisposable {
 	/**
 	 * List all available prompt files.
 	 */
-	listPromptFiles(type: PromptsType): Promise<readonly IPromptPath[]>;
+	listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]>;
 
 	/**
 	 * Get a list of prompt source folders based on the provided prompt type.