Skip to content

Commit ddb8c8b

Browse files
aeschliaeschli
authored
move platform/prompts to vs/workbench/contrib/chat/common/promptSyntax (microsoft#250889)
* move platform/prompts to vs/workbench/contrib/chat/common/promptSyntax * promptSync: bring back extension check
1 parent 3031610 commit ddb8c8b

File tree

73 files changed

+1683
-1015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1683
-1015
lines changed

‎src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IStringDictionary } from '../../../../base/common/collections.js';
1313
import { CancellationToken } from '../../../../base/common/cancellation.js';
1414
import { IUriIdentityService } from '../../../uriIdentity/common/uriIdentity.js';
1515
import { IEnvironmentService } from '../../../environment/common/environment.js';
16-
import { isPromptOrInstructionsFile } from '../../../prompts/common/prompts.js';
16+
1717
import { IUserDataProfile } from '../../../userDataProfile/common/userDataProfile.js';
1818
import { IConfigurationService } from '../../../configuration/common/configuration.js';
1919
import { areSame, IMergeResult as IPromptsMergeResult, merge } from './promptsMerge.js';
@@ -516,14 +516,12 @@ export class PromptsSynchronizer extends AbstractSynchroniser implements IUserDa
516516
}
517517
for (const entry of stat.children || []) {
518518
const resource = entry.resource;
519-
520-
if (isPromptOrInstructionsFile(resource) === false) {
521-
continue;
519+
const path = resource.path;
520+
if (['.prompt.md', '.instructions.md', '.chatmode.md'].some(ext => path.endsWith(ext))) {
521+
const key = this.extUri.relativePath(this.promptsFolder, resource)!;
522+
const content = await this.fileService.readFile(resource);
523+
prompts[key] = content;
522524
}
523-
524-
const key = this.extUri.relativePath(this.promptsFolder, resource)!;
525-
const content = await this.fileService.readFile(resource);
526-
prompts[key] = content;
527525
}
528526

529527
return prompts;

‎src/vs/workbench/contrib/chat/browser/attachments/promptInstructions/promptInstructionsCollectionWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
1010
import { ILogService } from '../../../../../../platform/log/common/log.js';
1111
import { InstructionsAttachmentWidget } from './promptInstructionsWidget.js';
1212
import { IModelService } from '../../../../../../editor/common/services/model.js';
13-
import { INSTRUCTIONS_LANGUAGE_ID } from '../../../common/promptSyntax/constants.js';
13+
import { INSTRUCTIONS_LANGUAGE_ID } from '../../../common/promptSyntax/promptTypes.js';
1414
import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
1515
import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
1616
import { ChatPromptAttachmentsCollection } from '../../chatAttachmentModel/chatPromptAttachmentsCollection.js';

‎src/vs/workbench/contrib/chat/browser/attachments/promptInstructions/promptInstructionsWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { IHoverService } from '../../../../../../platform/hover/browser/hover.js
2020
import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
2121
import { FileKind, IFileService } from '../../../../../../platform/files/common/files.js';
2222
import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
23-
import { getCleanPromptName } from '../../../../../../platform/prompts/common/prompts.js';
23+
import { getCleanPromptName } from '../../../common/promptSyntax/config/promptFileLocations.js';
2424
import { ObservableDisposable } from '../../../common/promptSyntax/utils/observableDisposable.js';
2525
import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
2626
import { ChatPromptAttachmentModel } from '../../chatAttachmentModel/chatPromptAttachmentModel.js';

‎src/vs/workbench/contrib/chat/browser/chat.contribution.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { SyncDescriptor } from '../../../../platform/instantiation/common/descri
2020
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
2121
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
2222
import { mcpGalleryServiceUrlConfig } from '../../../../platform/mcp/common/mcpManagement.js';
23-
import { PromptsConfig } from '../../../../platform/prompts/common/config.js';
24-
import { INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, MODE_DEFAULT_SOURCE_FOLDER, MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/prompts.js';
23+
import { PromptsConfig } from '../common/promptSyntax/config/config.js';
24+
import { INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, MODE_DEFAULT_SOURCE_FOLDER, MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION } from '../common/promptSyntax/config/promptFileLocations.js';
2525
import { Registry } from '../../../../platform/registry/common/platform.js';
2626
import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
2727
import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
@@ -48,10 +48,10 @@ import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } f
4848
import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
4949
import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
5050
import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
51-
import { INSTRUCTIONS_DOCUMENTATION_URL, MODE_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
52-
import { registerPromptFileContributions } from '../common/promptSyntax/contributions/index.js';
53-
import { PromptsService } from '../common/promptSyntax/service/promptsService.js';
54-
import { IPromptsService } from '../common/promptSyntax/service/types.js';
51+
import { INSTRUCTIONS_DOCUMENTATION_URL, MODE_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '../common/promptSyntax/promptTypes.js';
52+
import { registerPromptFileContributions } from '../common/promptSyntax/promptFileContributions.js';
53+
import { PromptsService } from '../common/promptSyntax/service/promptsServiceImpl.js';
54+
import { IPromptsService } from '../common/promptSyntax/service/promptsService.js';
5555
import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
5656
import { BuiltinToolsContribution } from '../common/tools/tools.js';
5757
import { ConfigureToolSets, UserToolSetsContributions } from './tools/toolSetsContribution.js';

‎src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { URI } from '../../../../../base/common/uri.js';
77
import { Emitter } from '../../../../../base/common/event.js';
88
import { basename, isEqual } from '../../../../../base/common/resources.js';
99
import { ChatPromptAttachmentModel } from './chatPromptAttachmentModel.js';
10-
import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
10+
import { PromptsConfig } from '../../common/promptSyntax/config/config.js';
1111
import { IPromptFileReference } from '../../common/promptSyntax/parsers/types.js';
1212
import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
1313
import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';

‎src/vs/workbench/contrib/chat/browser/chatWidget.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
3434
import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
3535
import { ILogService } from '../../../../platform/log/common/log.js';
3636
import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
37-
import { PromptsType } from '../../../../platform/prompts/common/prompts.js';
37+
import { PromptsType } from '../common/promptSyntax/promptTypes.js';
3838
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
3939
import { buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
4040
import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
@@ -54,7 +54,7 @@ import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js'
5454
import { ChatAgentLocation, ChatMode } from '../common/constants.js';
5555
import { ILanguageModelToolsService, IToolData, ToolSet } from '../common/languageModelToolsService.js';
5656
import { type TPromptMetadata } from '../common/promptSyntax/parsers/promptHeader/promptHeader.js';
57-
import { IMetadata, IPromptsService } from '../common/promptSyntax/service/types.js';
57+
import { IMetadata, IPromptsService } from '../common/promptSyntax/service/promptsService.js';
5858
import { handleModeSwitch } from './actions/chatActions.js';
5959
import { ChatTreeItem, IChatAcceptInputOptions, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from './chat.js';
6060
import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';

‎src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ICommandService } from '../../../../../platform/commands/common/command
1515
import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
1616
import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
1717
import { ILabelService } from '../../../../../platform/label/common/label.js';
18-
import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
18+
import { PromptsConfig } from '../../common/promptSyntax/config/config.js';
1919
import { IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
2020
import { IChatWidget } from '../chat.js';
2121
import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';

‎src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import { IChatRequestFileEntry, IChatRequestImplicitVariableEntry } from '../../
2525
import { IChatService } from '../../common/chatService.js';
2626
import { ChatAgentLocation } from '../../common/constants.js';
2727
import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
28-
import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/constants.js';
29-
import { IPromptsService, TSharedPrompt } from '../../common/promptSyntax/service/types.js';
28+
import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/promptTypes.js';
29+
import { IPromptsService, TSharedPrompt } from '../../common/promptSyntax/service/promptsService.js';
3030
import { IChatWidget, IChatWidgetService } from '../chat.js';
3131
import { toChatVariable } from '../chatAttachmentModel/chatPromptAttachmentsCollection.js';
3232

‎src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
5252
import { IDynamicVariable } from '../../common/chatVariables.js';
5353
import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
5454
import { ToolSet } from '../../common/languageModelToolsService.js';
55-
import { IPromptsService } from '../../common/promptSyntax/service/types.js';
55+
import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
5656
import { ChatSubmitAction } from '../actions/chatExecuteActions.js';
5757
import { IChatWidget, IChatWidgetService } from '../chat.js';
5858
import { ChatInputPart } from '../chatInputPart.js';

‎src/vs/workbench/contrib/chat/browser/modelPicker/modePickerActionItem.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IKeybindingService } from '../../../../../platform/keybinding/common/ke
1919
import { IChatAgentService } from '../../common/chatAgents.js';
2020
import { IChatMode, IChatModeService } from '../../common/chatModes.js';
2121
import { ChatAgentLocation, ChatMode, modeToString } from '../../common/constants.js';
22-
import { IPromptsService } from '../../common/promptSyntax/service/types.js';
22+
import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
2323
import { getOpenChatActionIdForMode } from '../actions/chatActions.js';
2424
import { IToggleChatModeArgs } from '../actions/chatExecuteActions.js';
2525

0 commit comments

Comments
 (0)