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

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

@@ -16,7 +16,7 @@ import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IPaneCompositePartService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IDirtyDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/diff.service";
+import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
 export declare class MainThreadDocumentsAndEditors {
     private readonly _modelService;
     private readonly _textFileService;
@@ -28,7 +28,7 @@ export declare class MainThreadDocumentsAndEditors {
     private readonly _mainThreadDocuments;
     private readonly _mainThreadEditors;
     private readonly _textEditors;
-    constructor(extHostContext: IExtHostContext, _modelService: IModelService, _textFileService: ITextFileService, _editorService: IEditorService, codeEditorService: ICodeEditorService, fileService: IFileService, textModelResolverService: ITextModelService, _editorGroupService: IEditorGroupsService, paneCompositeService: IPaneCompositePartService, environmentService: IWorkbenchEnvironmentService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, _clipboardService: IClipboardService, pathService: IPathService, configurationService: IConfigurationService, dirtyDiffModelService: IDirtyDiffModelService);
+    constructor(extHostContext: IExtHostContext, _modelService: IModelService, _textFileService: ITextFileService, _editorService: IEditorService, codeEditorService: ICodeEditorService, fileService: IFileService, textModelResolverService: ITextModelService, _editorGroupService: IEditorGroupsService, paneCompositeService: IPaneCompositePartService, environmentService: IWorkbenchEnvironmentService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, _clipboardService: IClipboardService, pathService: IPathService, configurationService: IConfigurationService, quickDiffModelService: IQuickDiffModelService);
     dispose(): void;
     private _onDelta;
     private _toModelAddData;

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

@@ -26,7 +26,7 @@ import { diffSets, diffMaps } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IDirtyDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/diff.service';
+import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
 
 class TextEditorSnapshot {
     constructor(editor) {
@@ -211,7 +211,7 @@ MainThreadDocumentAndEditorStateComputer = ( __decorate([
     ( __param(4, IPaneCompositePartService))
 ], MainThreadDocumentAndEditorStateComputer));
 let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
-    constructor(extHostContext, _modelService, _textFileService, _editorService, codeEditorService, fileService, textModelResolverService, _editorGroupService, paneCompositeService, environmentService, workingCopyFileService, uriIdentityService, _clipboardService, pathService, configurationService, dirtyDiffModelService) {
+    constructor(extHostContext, _modelService, _textFileService, _editorService, codeEditorService, fileService, textModelResolverService, _editorGroupService, paneCompositeService, environmentService, workingCopyFileService, uriIdentityService, _clipboardService, pathService, configurationService, quickDiffModelService) {
         this._modelService = _modelService;
         this._textFileService = _textFileService;
         this._editorService = _editorService;
@@ -239,7 +239,7 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
             this._editorService,
             this._editorGroupService,
             configurationService,
-            dirtyDiffModelService,
+            quickDiffModelService,
             uriIdentityService
         )));
         extHostContext.set(MainContext.MainThreadTextEditors, this._mainThreadEditors);
@@ -374,7 +374,7 @@ MainThreadDocumentsAndEditors = __decorate([
     ( __param(12, IClipboardService)),
     ( __param(13, IPathService)),
     ( __param(14, IConfigurationService)),
-    ( __param(15, IDirtyDiffModelService))
+    ( __param(15, IQuickDiffModelService))
 ], MainThreadDocumentsAndEditors);
 
 export { MainThreadDocumentsAndEditors };

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

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2276, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2316, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

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

@@ -8,18 +8,18 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, TabInputKind, TabModelOperationKind, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { EditorResourceAccessor, SideBySideEditor, GroupModelChangeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/diffEditorInput';
 import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel';
-import { SideBySideEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-0139c6af-2375-559c-af57-b738f2fd6d8e-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { SideBySideEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
+import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { TerminalEditorInput } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-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 { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupDirection, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

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

@@ -15,7 +15,7 @@ import { IExtHostContext } from "../../services/extensions/common/extHostCustome
 import { IEditorControl } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IDirtyDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/diff.service";
+import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 export interface IMainThreadEditorLocator {
     getEditor(id: string): MainThreadTextEditor | undefined;
@@ -28,7 +28,7 @@ export declare class MainThreadTextEditors implements MainThreadTextEditorsShape
     private readonly _editorService;
     private readonly _editorGroupService;
     private readonly _configurationService;
-    private readonly _dirtyDiffModelService;
+    private readonly _quickDiffModelService;
     private readonly _uriIdentityService;
     private static INSTANCE_COUNT;
     private readonly _instanceId;
@@ -37,7 +37,7 @@ export declare class MainThreadTextEditors implements MainThreadTextEditorsShape
     private _textEditorsListenersMap;
     private _editorPositionData;
     private _registeredDecorationTypes;
-    constructor(_editorLocator: IMainThreadEditorLocator, extHostContext: IExtHostContext, _codeEditorService: ICodeEditorService, _editorService: IEditorService, _editorGroupService: IEditorGroupsService, _configurationService: IConfigurationService, _dirtyDiffModelService: IDirtyDiffModelService, _uriIdentityService: IUriIdentityService);
+    constructor(_editorLocator: IMainThreadEditorLocator, extHostContext: IExtHostContext, _codeEditorService: ICodeEditorService, _editorService: IEditorService, _editorGroupService: IEditorGroupsService, _configurationService: IConfigurationService, _quickDiffModelService: IQuickDiffModelService, _uriIdentityService: IUriIdentityService);
     dispose(): void;
     handleTextEditorAdded(textEditor: MainThreadTextEditor): void;
     handleTextEditorRemoved(id: string): void;

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

@@ -15,7 +15,7 @@ import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IDirtyDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/diff.service';
+import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
 import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
@@ -29,13 +29,13 @@ var MainThreadTextEditors_1;
 let MainThreadTextEditors = class MainThreadTextEditors {
     static { MainThreadTextEditors_1 = this; }
     static { this.INSTANCE_COUNT = 0; }
-    constructor(_editorLocator, extHostContext, _codeEditorService, _editorService, _editorGroupService, _configurationService, _dirtyDiffModelService, _uriIdentityService) {
+    constructor(_editorLocator, extHostContext, _codeEditorService, _editorService, _editorGroupService, _configurationService, _quickDiffModelService, _uriIdentityService) {
         this._editorLocator = _editorLocator;
         this._codeEditorService = _codeEditorService;
         this._editorService = _editorService;
         this._editorGroupService = _editorGroupService;
         this._configurationService = _configurationService;
-        this._dirtyDiffModelService = _dirtyDiffModelService;
+        this._quickDiffModelService = _quickDiffModelService;
         this._uriIdentityService = _uriIdentityService;
         this._toDispose = ( new DisposableStore());
         this._instanceId = String(++MainThreadTextEditors_1.INSTANCE_COUNT);
@@ -64,7 +64,7 @@ let MainThreadTextEditors = class MainThreadTextEditors {
         toDispose.push(textEditor.onPropertiesChanged((data) => {
             this._proxy.$acceptEditorPropertiesChanged(id, data);
         }));
-        const diffInformationObs = this._getTextEditorDiffInformation(textEditor);
+        const diffInformationObs = this._getTextEditorDiffInformation(textEditor, toDispose);
         toDispose.push(autorun(reader => {
             const diffInformation = diffInformationObs.read(reader);
             this._proxy.$acceptEditorDiffInformation(id, diffInformation);
@@ -92,13 +92,13 @@ let MainThreadTextEditors = class MainThreadTextEditors {
         }
         return result;
     }
-    _getTextEditorDiffInformation(textEditor) {
+    _getTextEditorDiffInformation(textEditor, toDispose) {
         const codeEditor = textEditor.getCodeEditor();
         if (!codeEditor) {
             return constObservable(undefined);
         }
-        const diffEditors = this._codeEditorService.listDiffEditors();
-        const [diffEditor] = diffEditors.filter(d => d.getOriginalEditor().getId() === codeEditor.getId() ||
+        const [diffEditor] = this._codeEditorService.listDiffEditors()
+            .filter(d => d.getOriginalEditor().getId() === codeEditor.getId() ||
             d.getModifiedEditor().getId() === codeEditor.getId());
         const editorModelObs = diffEditor
             ? observableFromEvent(this, diffEditor.onDidChangeModel, () => diffEditor.getModel())
@@ -112,28 +112,40 @@ let MainThreadTextEditors = class MainThreadTextEditors {
                 ? editorModel.uri
                 : editorModel.modified.uri;
             if (isITextModel(editorModel)) {
-                const dirtyDiffModel = this._dirtyDiffModelService.getDirtyDiffModel(editorModelUri);
-                if (!dirtyDiffModel) {
+                const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri);
+                if (!quickDiffModelRef) {
                     return constObservable(undefined);
                 }
-                return observableFromEvent(this, dirtyDiffModel.onDidChange, () => {
-                    return dirtyDiffModel.getQuickDiffResults();
+                toDispose.push(quickDiffModelRef);
+                return observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
+                    return ( quickDiffModelRef.object.getQuickDiffResults()
+                        .map(result => ({
+                        original: result.original,
+                        modified: result.modified,
+                        changes: result.changes2
+                    })));
                 });
             }
             const diffAlgorithm = this._configurationService.getValue('diffEditor.diffAlgorithm');
-            const dirtyDiffModel = this._dirtyDiffModelService.getDiffModel(editorModelUri, diffAlgorithm);
-            if (!dirtyDiffModel) {
+            const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri, { algorithm: diffAlgorithm });
+            if (!quickDiffModelRef) {
                 return constObservable(undefined);
             }
-            return observableFromEvent(Event.any(dirtyDiffModel.onDidChange, diffEditor.onDidUpdateDiff), () => {
-                const dirtyDiffInformation = dirtyDiffModel.getQuickDiffResults();
+            toDispose.push(quickDiffModelRef);
+            return observableFromEvent(Event.any(quickDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
+                const quickDiffInformation = ( quickDiffModelRef.object.getQuickDiffResults()
+                    .map(result => ({
+                    original: result.original,
+                    modified: result.modified,
+                    changes: result.changes2
+                })));
                 const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
                 const diffInformation = [{
                         original: editorModel.original.uri,
                         modified: editorModel.modified.uri,
                         changes: ( diffChanges.map(change => change))
                     }];
-                return [...dirtyDiffInformation, ...diffInformation];
+                return [...quickDiffInformation, ...diffInformation];
             });
         });
         return derivedOpts({
@@ -290,11 +302,21 @@ let MainThreadTextEditors = class MainThreadTextEditors {
         if (diffEditor) {
             return Promise.resolve(diffEditor.getLineChanges() || []);
         }
-        const dirtyDiffContribution = codeEditor.getContribution('editor.contrib.dirtydiff');
-        if (dirtyDiffContribution) {
-            return Promise.resolve(dirtyDiffContribution.getChanges());
+        if (!codeEditor.hasModel()) {
+            return Promise.resolve([]);
+        }
+        const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(codeEditor.getModel().uri);
+        if (!quickDiffModelRef) {
+            return Promise.resolve([]);
+        }
+        try {
+            const scmQuickDiff = quickDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.isSCM);
+            const scmQuickDiffChanges = quickDiffModelRef.object.changes.filter(change => change.label === scmQuickDiff?.label);
+            return Promise.resolve(( scmQuickDiffChanges.map(change => change.change)) ?? []);
+        }
+        finally {
+            quickDiffModelRef.dispose();
         }
-        return Promise.resolve([]);
     }
 };
 MainThreadTextEditors = MainThreadTextEditors_1 = ( __decorate([
@@ -302,7 +324,7 @@ MainThreadTextEditors = MainThreadTextEditors_1 = ( __decorate([
     ( __param(3, IEditorService)),
     ( __param(4, IEditorGroupsService)),
     ( __param(5, IConfigurationService)),
-    ( __param(6, IDirtyDiffModelService)),
+    ( __param(6, IQuickDiffModelService)),
     ( __param(7, IUriIdentityService))
 ], MainThreadTextEditors));
 CommandsRegistry.registerCommand('_workbench.revertAllDirty', async function (accessor) {

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

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2277,
+                    2317,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [( new Action('reload', ( localize(2278, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2318, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2279,
+                        2319,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2280,
+                        2320,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('manageWorkspaceTrust', ( localize(2281, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2321, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
                     }
                 });
             }
@@ -130,13 +130,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2282,
+                        2322,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('enable', ( localize(2283, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2323, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                     }
                 });
@@ -145,7 +145,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2284,
+                        2324,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +166,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2285,
+                    2325,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( new Action('install', ( localize(2286, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2326, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2287,
+                2327,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

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

@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2288,
+                                2328,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2289,
+                                2329,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2290,
+                                2330,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2291,
+                                2331,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -105,28 +105,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2292,
+                                2332,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2293,
+                                2333,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2294,
+                                2334,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2295,
+                                2335,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -136,8 +136,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2296, "Show &&Preview")),
-                            cancelButton: ( localize(2297, "Skip Changes"))
+                            primaryButton: ( localize(2336, "Show &&Preview")),
+                            cancelButton: ( localize(2337, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2298, "&&OK")),
+                                    label: ( localize(2338, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2296, "Show &&Preview")),
+                                    label: ( localize(2336, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2297, "Skip Changes")),
+                                label: ( localize(2337, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2299, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2339, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -185,15 +185,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return localize(2300, "Running 'File Create' participants...");
+                        return localize(2340, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2301, "Running 'File Rename' participants...");
+                        return localize(2341, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2302, "Running 'File Copy' participants...");
+                        return localize(2342, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2303, "Running 'File Delete' participants...");
+                        return localize(2343, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2304, "Running 'File Write' participants...");
+                        return localize(2344, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2305, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2345, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { MainThreadLabelServiceShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

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
                 };
             }