@codingame/monaco-vscode-extensions-service-override 13.1.7 → 14.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.d.ts

@@ -59,7 +59,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     private static _inflateSuggestDto;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
     $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, yieldsToExtensionIds: string[]): void;
-    $registerInlineEditProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier): void;
+    $registerInlineEditProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier, displayName: string): void;
     $registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
     $registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
     $emitInlayHintsEvent(eventHandle: number): void;
@@ -78,7 +78,6 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     private readonly _documentOnDropEditProviders;
     $registerDocumentOnDropEditProvider(handle: number, selector: IDocumentFilterDto[], metadata: IDocumentDropEditProviderMetadata): void;
     $resolveDocumentOnDropFileData(handle: number, requestId: number, dataId: string): Promise<VSBuffer>;
-    $registerMappedEditsProvider(handle: number, selector: IDocumentFilterDto[], displayName: string): void;
 }
 export declare class MainThreadDocumentSemanticTokensProvider implements languages.DocumentSemanticTokensProvider {
     private readonly _proxy;
@@ -98,11 +97,3 @@ export declare class MainThreadDocumentRangeSemanticTokensProvider implements la
     getLegend(): languages.SemanticTokensLegend;
     provideDocumentRangeSemanticTokens(model: ITextModel, range: EditorRange, token: CancellationToken): Promise<languages.SemanticTokens | null>;
 }
-export declare class MainThreadMappedEditsProvider implements languages.MappedEditsProvider {
-    readonly displayName: string;
-    private readonly _handle;
-    private readonly _proxy;
-    private readonly _uriService;
-    constructor(displayName: string, _handle: number, _proxy: ExtHostLanguageFeaturesShape, _uriService: IUriIdentityService);
-    provideMappedEdits(document: ITextModel, codeBlocks: string[], context: languages.MappedEditsContext, token: CancellationToken): Promise<languages.WorkspaceEdit | null>;
-}

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js

@@ -525,8 +525,9 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         };
         this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
     }
-    $registerInlineEditProvider(handle, selector, extensionId) {
+    $registerInlineEditProvider(handle, selector, extensionId, displayName) {
         const provider = {
+            displayName,
             provideInlineEdit: async (model, context, token) => {
                 return this._proxy.$provideInlineEdit(handle, model.uri, context, token);
             },
@@ -826,10 +827,6 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         }
         return provider.resolveDocumentOnDropFileData(requestId, dataId);
     }
-    $registerMappedEditsProvider(handle, selector, displayName) {
-        const provider = ( new MainThreadMappedEditsProvider(displayName, handle, this._proxy, this._uriIdentService));
-        this._registrations.set(handle, this._languageFeaturesService.mappedEditsProvider.register(selector, provider));
-    }
 };
 MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadLanguageFeatures),
@@ -1033,17 +1030,5 @@ class MainThreadDocumentRangeSemanticTokensProvider {
         throw ( new Error(`Unexpected`));
     }
 }
-class MainThreadMappedEditsProvider {
-    constructor(displayName, _handle, _proxy, _uriService) {
-        this.displayName = displayName;
-        this._handle = _handle;
-        this._proxy = _proxy;
-        this._uriService = _uriService;
-    }
-    async provideMappedEdits(document, codeBlocks, context, token) {
-        const res = await this._proxy.$provideMappedEdits(this._handle, document.uri, codeBlocks, context, token);
-        return res ? reviveWorkspaceEditDto(res, this._uriService) : null;
-    }
-}
 
-export { MainThreadDocumentRangeSemanticTokensProvider, MainThreadDocumentSemanticTokensProvider, MainThreadLanguageFeatures, MainThreadMappedEditsProvider };
+export { MainThreadDocumentRangeSemanticTokensProvider, MainThreadDocumentSemanticTokensProvider, MainThreadLanguageFeatures };

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -16,6 +16,7 @@ import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { LanguageModelError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
 
 let MainThreadLanguageModels = class MainThreadLanguageModels {
     constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService, _ignoredFilesService) {
@@ -84,7 +85,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (data) {
             this._pendingProgress.delete(requestId);
             if (err) {
-                const error = transformErrorFromSerialization(err);
+                const error = LanguageModelError.tryDeserialize(err) ?? transformErrorFromSerialization(err);
                 data.stream.reject(error);
                 data.defer.error(error);
             }
@@ -135,7 +136,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2306, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2346, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -51,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 };
             }
             if (!source) {
-                source = ( localize(2307, "Extension"));
+                source = ( localize(2347, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2308, "Manage Extension")),
+                    label: ( localize(2348, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -92,13 +92,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2309, "Cancel")),
+                    label: ( localize(2349, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2310, "&&OK")),
+                    label: ( localize(2350, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js

@@ -11,7 +11,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js

@@ -9,7 +9,7 @@ import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.d.ts

@@ -1,6 +1,6 @@
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import * as notebookCommon from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare namespace NotebookDto {
     function toNotebookOutputItemDto(item: notebookCommon.IOutputItemDto): extHostProtocol.NotebookOutputItemDto;
     function toNotebookOutputDto(output: notebookCommon.IOutputDto): extHostProtocol.NotebookOutputDto;

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.d.ts

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { ICellRange } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js

@@ -5,7 +5,7 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js

@@ -10,7 +10,7 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { NotebookExecutionType } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -6,7 +6,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2311, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2351, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -40,7 +40,7 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
         MainThreadOutputService_1._extensionIdPool.set(extensionId, idCounter);
         const id = `extension-output-${extensionId}-#${idCounter}-${label}`;
         const resource = URI.revive(file);
-        ( Registry.as(Extensions.OutputChannels)).registerChannel({ id, label, file: resource, log: false, languageId, extensionId });
+        ( Registry.as(Extensions.OutputChannels)).registerChannel({ id, label, source: { resource }, log: false, languageId, extensionId });
         this._register(toDisposable(() => this.$dispose(id)));
         return id;
     }
@@ -69,11 +69,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2312, "Show Output")),
+            name: ( localize(2352, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2313, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2353, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2314, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2354, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -7,6 +7,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 class ManageExtensionAction extends Action {
     constructor(extensionId, label, commandService) {
@@ -32,11 +33,16 @@ let MainThreadProgress = class MainThreadProgress {
             const notificationOptions = {
                 ...options,
                 location: ProgressLocation.Notification,
-                secondaryActions: [( new ManageExtensionAction(extensionId, ( localize(2315, "Manage Extension")), this._commandService))]
+                secondaryActions: [( new ManageExtensionAction(extensionId, ( localize(2355, "Manage Extension")), this._commandService))]
             };
             options = notificationOptions;
         }
-        this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
+        try {
+            this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
+        }
+        catch (err) {
+            onUnexpectedExternalError(err);
+        }
     }
     $progressReport(handle, message) {
         const entry = this._progress.get(handle);

package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Barrier } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { isUriComponents, URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/api';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
@@ -31,25 +31,23 @@ function getIconFromIconDto(iconDto) {
     if (iconDto === undefined) {
         return undefined;
     }
-    else if (URI.isUri(iconDto)) {
-        return URI.revive(iconDto);
-    }
     else if (ThemeIcon.isThemeIcon(iconDto)) {
         return iconDto;
     }
+    else if (isUriComponents(iconDto)) {
+        return URI.revive(iconDto);
+    }
     else {
         const icon = iconDto;
         return { light: URI.revive(icon.light), dark: URI.revive(icon.dark) };
     }
 }
 function toISCMHistoryItem(historyItemDto) {
+    const authorIcon = getIconFromIconDto(historyItemDto.authorIcon);
     const references = historyItemDto.references?.map(r => ({
         ...r, icon: getIconFromIconDto(r.icon)
     }));
-    const newLineIndex = historyItemDto.message.indexOf('\n');
-    const subject = newLineIndex === -1 ?
-        historyItemDto.message : `${historyItemDto.message.substring(0, newLineIndex)}\u2026`;
-    return { ...historyItemDto, subject, references };
+    return { ...historyItemDto, authorIcon, references };
 }
 function toISCMHistoryItemRef(historyItemRefDto, color) {
     return historyItemRefDto ? { ...historyItemRefDto, icon: getIconFromIconDto(historyItemRefDto.icon), color: color } : undefined;
@@ -181,8 +179,7 @@ class MainThreadSCMHistoryProvider {
         return changes?.map(change => ({
             uri: URI.revive(change.uri),
             originalUri: change.originalUri && URI.revive(change.originalUri),
-            modifiedUri: change.modifiedUri && URI.revive(change.modifiedUri),
-            renameUri: change.renameUri && URI.revive(change.renameUri)
+            modifiedUri: change.modifiedUri && URI.revive(change.modifiedUri)
         }));
     }
     $onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef) {

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2316, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2356, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error('listener failed')));

package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.d.ts

@@ -7,9 +7,10 @@ import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { IExtensionStatusBarItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/statusBarService";
 export declare class MainThreadStatusBar implements MainThreadStatusBarShape {
     private readonly statusbarService;
+    private readonly _proxy;
     private readonly _store;
     constructor(extHostContext: IExtHostContext, statusbarService: IExtensionStatusBarItemService);
     dispose(): void;
-    $setEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
+    $setEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, hasTooltipProvider: boolean, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
     $disposeEntry(entryId: string): void;
 }

package/vscode/src/vs/workbench/api/browser/mainThreadStatusBar.js

@@ -10,15 +10,15 @@ let MainThreadStatusBar = class MainThreadStatusBar {
     constructor(extHostContext, statusbarService) {
         this.statusbarService = statusbarService;
         this._store = ( new DisposableStore());
-        const proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStatusBar));
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStatusBar));
         const entries = [];
         for (const [entryId, item] of statusbarService.getEntries()) {
             entries.push(asDto(entryId, item));
         }
-        proxy.$acceptStaticEntries(entries);
+        this._proxy.$acceptStaticEntries(entries);
         this._store.add(statusbarService.onDidChange(e => {
             if (e.added) {
-                proxy.$acceptStaticEntries([asDto(e.added[0], e.added[1])]);
+                this._proxy.$acceptStaticEntries([asDto(e.added[0], e.added[1])]);
             }
         }));
         function asDto(entryId, item) {
@@ -37,8 +37,16 @@ let MainThreadStatusBar = class MainThreadStatusBar {
     dispose() {
         this._store.dispose();
     }
-    $setEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation) {
-        const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltip, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
+    $setEntry(entryId, id, extensionId, name, text, tooltip, hasTooltipProvider, command, color, backgroundColor, alignLeft, priority, accessibilityInformation) {
+        const tooltipOrTooltipProvider = hasTooltipProvider
+            ? {
+                markdown: (cancellation) => {
+                    return this._proxy.$provideTooltip(entryId, cancellation);
+                },
+                markdownNotSupportedFallback: undefined
+            }
+            : tooltip;
+        const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltipOrTooltipProvider, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
         if (kind === StatusBarUpdateKind.DidDefine) {
             this._store.add(toDisposable(() => this.statusbarService.unsetEntry(entryId)));
         }

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -378,7 +378,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2317, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2357, '{0}: {1}', source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.d.ts

@@ -66,6 +66,7 @@ export declare class MainThreadTerminalService implements MainThreadTerminalServ
     private _onTerminalData;
     private _onDidExecuteCommand;
     private _onTitleChanged;
+    private _onShellTypeChanged;
     private _onTerminalDisposed;
     private _onTerminalOpened;
     private _onTerminalProcessIdReady;

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js

@@ -60,9 +60,13 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         this._store.add(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
         this._store.add(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
         this._store.add(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
+        this._store.add(_terminalService.onAnyInstanceShellTypeChanged(instance => this._onShellTypeChanged(instance.instanceId)));
         for (const instance of this._terminalService.instances) {
             this._onTerminalOpened(instance);
             instance.processReady.then(() => this._onTerminalProcessIdReady(instance));
+            if (instance.shellType) {
+                this._proxy.$acceptTerminalShellType(instance.instanceId, instance.shellType);
+            }
         }
         const activeInstance = this._terminalService.activeInstance;
         if (activeInstance) {
@@ -221,7 +225,13 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         this._completionProviders.set(id, this._terminalCompletionService.registerTerminalCompletionProvider(extensionIdentifier, id, {
             id,
             provideCompletions: async (commandLine, cursorPosition, token) => {
-                return await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition }, token);
+                const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition }, token);
+                if (Array.isArray(completions)) {
+                    return ( completions.map(c => ({ ...c, provider: id })));
+                }
+                else {
+                    return { items: completions?.items.map(c => ({ ...c, provider: id })), resourceRequestConfig: completions?.resourceRequestConfig };
+                }
             }
         }, ...triggerCharacters));
     }
@@ -292,6 +302,12 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     _onTitleChanged(terminalId, name) {
         this._proxy.$acceptTerminalTitleChange(terminalId, name);
     }
+    _onShellTypeChanged(terminalId) {
+        const terminalInstance = this._terminalService.getInstanceFromId(terminalId);
+        if (terminalInstance) {
+            this._proxy.$acceptTerminalShellType(terminalId, terminalInstance.shellType);
+        }
+    }
     _onTerminalDisposed(terminalInstance) {
         this._proxy.$acceptTerminalClosed(terminalInstance.instanceId, terminalInstance.exitCode, terminalInstance.exitReason ?? TerminalExitReason.Unknown);
     }

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.js

@@ -21,12 +21,31 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 listener.dispose();
             }
         }));
+        for (const terminal of this._terminalService.instances) {
+            if (( terminal.capabilities.has(TerminalCapability.CommandDetection))) {
+                this._proxy.$shellIntegrationChange(terminal.instanceId);
+                const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
+                if (cwdDetection) {
+                    this._proxy.$cwdChange(terminal.instanceId, this._convertCwdToUri(cwdDetection.getCwd()));
+                }
+            }
+        }
         const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
             return ( Event.map(Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
                 return e === TerminalCapability.CommandDetection || e === TerminalCapability.CwdDetection;
             }), () => instance));
         })).event;
         this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
+        const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
+        this._store.add(cwdChangeEvent.event(e => {
+            this._proxy.$cwdChange(e.instance.instanceId, this._convertCwdToUri(e.data));
+        }));
+        const envChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.ShellEnvDetection, e => e.onDidChangeEnv));
+        this._store.add(envChangeEvent.event(e => {
+            const keysArr = Array.from(( e.data.keys()));
+            const valuesArr = Array.from(( e.data.values()));
+            this._proxy.$shellEnvChange(e.instance.instanceId, keysArr, valuesArr);
+        }));
         const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandExecuted));
         let currentCommand;
         this._store.add(commandDetectionStartEvent.event(e => {
@@ -48,10 +67,6 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
             });
         }));
-        const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
-        this._store.add(cwdChangeEvent.event(e => {
-            this._proxy.$cwdChange(e.instance.instanceId, this._convertCwdToUri(e.data));
-        }));
         this._store.add(this._terminalService.onDidDisposeInstance(e => this._proxy.$closeTerminal(e.instanceId)));
     }
     $executeCommand(terminalId, commandLine) {

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -112,13 +112,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2318,
+            2358,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-                label: ( localize(2319, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2359, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
                 run: async () => {
                     this.elevateionRetry = true;
                     await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -52,7 +52,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action('default', ( localize(2320, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2360, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId,
@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2321, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2361, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
                             actions: {
                                 primary: [
                                     openDefaultAction

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.d.ts

@@ -4,7 +4,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { MainThreadWebviews } from "./mainThreadWebviews.js";
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { WebviewInput } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js

@@ -10,9 +10,9 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { reviveWebviewExtension, reviveWebviewContentOptions } from './mainThreadWebviews.js';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/diffEditorInput';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewInput } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription } from "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription } from "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 export declare class MainThreadWebviews extends Disposable implements extHostProtocol.MainThreadWebviewsShape {
     private readonly _openerService;

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -104,7 +104,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
 			</head>
-			<body>${( localize(2322, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+			<body>${( localize(2362, "An error occurred while loading view: {0}", escape(viewType)))}</body>
 		</html>`;
     }
 };

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -77,11 +77,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2323, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2363, "Extension '{0}' added 1 folder to the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2324,
+                    2364,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -90,11 +90,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2325, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2365, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2326,
+                    2366,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -102,7 +102,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2327, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2367, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }