mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-18 15:55:59 +01:00
Merge branch 'main' into connor4312/kabutops
This commit is contained in:
@@ -110,6 +110,7 @@ import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
|
||||
import { ExtHostWebviewViews } from './extHostWebviewView.js';
|
||||
import { IExtHostWindow } from './extHostWindow.js';
|
||||
import { IExtHostWorkspace } from './extHostWorkspace.js';
|
||||
import { ExtHostAiSettingsSearch } from './extHostAiSettingsSearch.js';
|
||||
|
||||
export interface IExtensionRegistries {
|
||||
mine: ExtensionDescriptionRegistry;
|
||||
@@ -218,6 +219,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels, extHostDiagnostics, extHostLanguageModelTools));
|
||||
const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
|
||||
const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, new ExtHostAiEmbeddingVector(rpcProtocol));
|
||||
const extHostAiSettingsSearch = rpcProtocol.set(ExtHostContext.ExtHostAiSettingsSearch, new ExtHostAiSettingsSearch(rpcProtocol));
|
||||
const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
|
||||
const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, new ExtHostSpeech(rpcProtocol));
|
||||
const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, new ExtHostEmbeddings(rpcProtocol));
|
||||
@@ -917,9 +919,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
checkProposedApiEnabled(extension, 'profileContentHandlers');
|
||||
return extHostProfileContentHandlers.registerProfileContentHandler(extension, id, handler);
|
||||
},
|
||||
registerQuickDiffProvider(selector: vscode.DocumentSelector, quickDiffProvider: vscode.QuickDiffProvider, label: string, rootUri?: vscode.Uri): vscode.Disposable {
|
||||
registerQuickDiffProvider(selector: vscode.DocumentSelector, quickDiffProvider: vscode.QuickDiffProvider, id: string, label: string, rootUri?: vscode.Uri): vscode.Disposable {
|
||||
checkProposedApiEnabled(extension, 'quickDiffProvider');
|
||||
return extHostQuickDiff.registerQuickDiffProvider(checkSelector(selector), quickDiffProvider, label, rootUri);
|
||||
return extHostQuickDiff.registerQuickDiffProvider(extension, checkSelector(selector), quickDiffProvider, id, label, rootUri);
|
||||
},
|
||||
get tabGroups(): vscode.TabGroups {
|
||||
return extHostEditorTabs.tabGroups;
|
||||
@@ -1438,10 +1440,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
registerEmbeddingVectorProvider(model: string, provider: vscode.EmbeddingVectorProvider) {
|
||||
checkProposedApiEnabled(extension, 'aiRelatedInformation');
|
||||
return extHostAiEmbeddingVector.registerEmbeddingVectorProvider(extension, model, provider);
|
||||
},
|
||||
registerSettingsSearchProvider(provider: vscode.SettingsSearchProvider) {
|
||||
checkProposedApiEnabled(extension, 'aiSettingsSearch');
|
||||
return extHostAiSettingsSearch.registerSettingsSearchProvider(extension, provider);
|
||||
}
|
||||
};
|
||||
|
||||
// namespace: chat
|
||||
// namespace: chatregisterMcpServerDefinitionProvider
|
||||
const chat: typeof vscode.chat = {
|
||||
registerMappedEditsProvider(_selector: vscode.DocumentSelector, _provider: vscode.MappedEditsProvider) {
|
||||
checkProposedApiEnabled(extension, 'mappedEditsProvider');
|
||||
@@ -1521,12 +1527,15 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
registerIgnoredFileProvider(provider: vscode.LanguageModelIgnoredFileProvider) {
|
||||
return extHostLanguageModels.registerIgnoredFileProvider(extension, provider);
|
||||
},
|
||||
registerMcpConfigurationProvider(id, provider) {
|
||||
registerMcpServerDefinitionProvider(id, provider) {
|
||||
checkProposedApiEnabled(extension, 'mcpConfigurationProvider');
|
||||
return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
|
||||
}
|
||||
};
|
||||
|
||||
// todo@connor4312: proposed API back-compat
|
||||
(lm as any).registerMcpConfigurationProvider = lm.registerMcpServerDefinitionProvider;
|
||||
|
||||
// namespace: speech
|
||||
const speech: typeof vscode.speech = {
|
||||
registerSpeechProvider(id: string, provider: vscode.SpeechProvider) {
|
||||
@@ -1781,6 +1790,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
PartialAcceptTriggerKind: extHostTypes.PartialAcceptTriggerKind,
|
||||
InlineCompletionEndOfLifeReasonKind: extHostTypes.InlineCompletionEndOfLifeReasonKind,
|
||||
KeywordRecognitionStatus: extHostTypes.KeywordRecognitionStatus,
|
||||
ChatImageMimeType: extHostTypes.ChatImageMimeType,
|
||||
ChatResponseMarkdownPart: extHostTypes.ChatResponseMarkdownPart,
|
||||
ChatResponseFileTreePart: extHostTypes.ChatResponseFileTreePart,
|
||||
ChatResponseAnchorPart: extHostTypes.ChatResponseAnchorPart,
|
||||
@@ -1819,7 +1829,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
LanguageModelToolResult2: extHostTypes.LanguageModelToolResult2,
|
||||
LanguageModelDataPart: extHostTypes.LanguageModelDataPart,
|
||||
LanguageModelExtraDataPart: extHostTypes.LanguageModelExtraDataPart,
|
||||
ChatImageMimeType: extHostTypes.ChatImageMimeType,
|
||||
ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
|
||||
PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
|
||||
LanguageModelChatToolMode: extHostTypes.LanguageModelChatToolMode,
|
||||
@@ -1837,6 +1846,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
|
||||
ChatErrorLevel: extHostTypes.ChatErrorLevel,
|
||||
McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition,
|
||||
McpStdioServerDefinition: extHostTypes.McpStdioServerDefinition,
|
||||
SettingsSearchResultKind: extHostTypes.SettingsSearchResultKind
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user