Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-18 15:55:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into pr/justschen/246553

Browse Source
This commit is contained in:
Connor Peet
2025-04-21 14:59:52 -07:00
parent 3006ef6ec8 5944e7c37c
commit eb62aa4adb
403 changed files with 14445 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -27,7 +27,7 @@ import { ExtensionDescriptionRegistry } from '../../services/extensions/common/e
import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
import { ProxyIdentifier } from '../../services/extensions/common/proxyIdentifier.js';
import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchContext2, TextSearchMatch2 } from '../../services/search/common/searchExtTypes.js';
import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchContext2, TextSearchMatch2, AISearchKeyword } from '../../services/search/common/searchExtTypes.js';
import { CandidatePortSource, ExtHostContext, ExtHostLogLevelServiceShape, MainContext } from './extHost.protocol.js';
import { ExtHostRelatedInformation } from './extHostAiRelatedInformation.js';
import { ExtHostApiCommands } from './extHostApiCommands.js';
@@ -1238,10 +1238,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
checkProposedApiEnabled(extension, 'canonicalUriProvider');
return extHostWorkspace.provideCanonicalUri(uri, options, token);
},
decode(content: Uint8Array, options: { uri?: vscode.Uri; encoding?: string }) {
decode(content: Uint8Array, options?: { uri?: vscode.Uri; encoding?: string }) {
return extHostWorkspace.decode(content, options);
},
encode(content: string, options: { uri?: vscode.Uri; encoding?: string }) {
encode(content: string, options?: { uri?: vscode.Uri; encoding?: string }) {
return extHostWorkspace.encode(content, options);
}
};
@@ -1515,7 +1515,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
get tools() {
return extHostLanguageModelTools.getTools(extension);
},
fileIsIgnored(uri: vscode.Uri, token: vscode.CancellationToken) {
fileIsIgnored(uri: vscode.Uri, token?: vscode.CancellationToken) {
return extHostLanguageModels.fileIsIgnored(extension, uri, token);
},
registerIgnoredFileProvider(provider: vscode.LanguageModelIgnoredFileProvider) {
@@ -1797,13 +1797,16 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
ChatResponseCommandButtonPart: extHostTypes.ChatResponseCommandButtonPart,
ChatResponseConfirmationPart: extHostTypes.ChatResponseConfirmationPart,
ChatResponseMovePart: extHostTypes.ChatResponseMovePart,
ChatResponseExtensionsPart: extHostTypes.ChatResponseExtensionsPart,
ChatResponseReferencePartStatusKind: extHostTypes.ChatResponseReferencePartStatusKind,
ChatRequestTurn: extHostTypes.ChatRequestTurn,
ChatRequestTurn2: extHostTypes.ChatRequestTurn,
ChatResponseTurn: extHostTypes.ChatResponseTurn,
ChatLocation: extHostTypes.ChatLocation,
ChatRequestEditorData: extHostTypes.ChatRequestEditorData,
ChatRequestNotebookData: extHostTypes.ChatRequestNotebookData,
ChatReferenceBinaryData: extHostTypes.ChatReferenceBinaryData,
ChatRequestEditedFileEventKind: extHostTypes.ChatRequestEditedFileEventKind,
LanguageModelChatMessageRole: extHostTypes.LanguageModelChatMessageRole,
LanguageModelChatMessage: extHostTypes.LanguageModelChatMessage,
LanguageModelChatMessage2: extHostTypes.LanguageModelChatMessage2,
@@ -1815,6 +1818,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
LanguageModelToolResult: extHostTypes.LanguageModelToolResult,
LanguageModelToolResult2: extHostTypes.LanguageModelToolResult2,
LanguageModelDataPart: extHostTypes.LanguageModelDataPart,
LanguageModelExtraDataPart: extHostTypes.LanguageModelExtraDataPart,
ChatImageMimeType: extHostTypes.ChatImageMimeType,
ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
@@ -1828,9 +1832,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
ExcludeSettingOptions: ExcludeSettingOptions,
TextSearchContext2: TextSearchContext2,
TextSearchMatch2: TextSearchMatch2,
AISearchKeyword: AISearchKeyword,
TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
ChatErrorLevel: extHostTypes.ChatErrorLevel,
McpSSEServerDefinition: extHostTypes.McpSSEServerDefinition,
McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition,
McpStdioServerDefinition: extHostTypes.McpStdioServerDefinition,
};
};