@codingame/monaco-vscode-extensions-service-override 11.1.2 → 12.0.1

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

@@ -1,26 +1,27 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
-import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
-import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
-import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { ExtHostContext, TabInputKind, TabModelOperationKind, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { EditorResourceAccessor, SideBySideEditor, GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
+import { DiffEditorInput } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-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 { 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 { TerminalEditorInput } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-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 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -73,7 +74,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
     _editorInputToDto(editor) {
         if (editor instanceof MergeEditorInput) {
             return {
-                kind: 3 ,
+                kind: TabInputKind.TextMergeInput,
                 base: editor.base,
                 input1: editor.input1.uri,
                 input2: editor.input2.uri,
@@ -82,7 +83,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         if (editor instanceof AbstractTextResourceEditorInput) {
             return {
-                kind: 1 ,
+                kind: TabInputKind.TextInput,
                 uri: editor.resource
             };
         }
@@ -95,48 +96,48 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 && primaryResource
                 && secondaryResource) {
                 return {
-                    kind: 1 ,
+                    kind: TabInputKind.TextInput,
                     uri: primaryResource
                 };
             }
-            return { kind: 0  };
+            return { kind: TabInputKind.UnknownInput };
         }
         if (editor instanceof NotebookEditorInput) {
             return {
-                kind: 4 ,
+                kind: TabInputKind.NotebookInput,
                 notebookType: editor.viewType,
                 uri: editor.resource
             };
         }
         if (editor instanceof CustomEditorInput) {
             return {
-                kind: 6 ,
+                kind: TabInputKind.CustomEditorInput,
                 viewType: editor.viewType,
                 uri: editor.resource,
             };
         }
         if (editor instanceof WebviewInput) {
             return {
-                kind: 7 ,
+                kind: TabInputKind.WebviewEditorInput,
                 viewType: editor.viewType
             };
         }
         if (editor instanceof TerminalEditorInput) {
             return {
-                kind: 8
+                kind: TabInputKind.TerminalEditorInput
             };
         }
         if (editor instanceof DiffEditorInput) {
             if (editor.modified instanceof AbstractTextResourceEditorInput && editor.original instanceof AbstractTextResourceEditorInput) {
                 return {
-                    kind: 2 ,
+                    kind: TabInputKind.TextDiffInput,
                     modified: editor.modified.resource,
                     original: editor.original.resource
                 };
             }
             if (editor.modified instanceof NotebookEditorInput && editor.original instanceof NotebookEditorInput) {
                 return {
-                    kind: 5 ,
+                    kind: TabInputKind.NotebookDiffInput,
                     notebookType: editor.original.viewType,
                     modified: editor.modified.resource,
                     original: editor.original.resource
@@ -145,14 +146,14 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         if (editor instanceof InteractiveEditorInput) {
             return {
-                kind: 9 ,
+                kind: TabInputKind.InteractiveEditorInput,
                 uri: editor.resource,
                 inputBoxUri: editor.inputResource
             };
         }
         if (editor instanceof ChatEditorInput) {
             return {
-                kind: 10 ,
+                kind: TabInputKind.ChatEditorInput,
             };
         }
         if (editor instanceof MultiDiffEditorInput) {
@@ -160,18 +161,18 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             for (const resource of (editor?.resources.get() ?? [])) {
                 if (resource.originalUri && resource.modifiedUri) {
                     diffEditors.push({
-                        kind: 2 ,
+                        kind: TabInputKind.TextDiffInput,
                         original: resource.originalUri,
                         modified: resource.modifiedUri
                     });
                 }
             }
             return {
-                kind: 11 ,
+                kind: TabInputKind.MultiDiffEditorInput,
                 diffEditors
             };
         }
-        return { kind: 0  };
+        return { kind: TabInputKind.UnknownInput };
     }
     _generateTabId(editor, groupId) {
         let resourceString;
@@ -201,7 +202,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 groupId,
                 index: editorIndex,
                 tabDto: tabInfo.tab,
-                kind: 2
+                kind: TabModelOperationKind.TAB_UPDATE
             });
         }
         else {
@@ -235,7 +236,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                     groupId,
                     index: editorIndex,
                     tabDto: tabInfo.tab,
-                    kind: 2
+                    kind: TabModelOperationKind.TAB_UPDATE
                 });
             }));
         }
@@ -243,7 +244,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             groupId,
             index: editorIndex,
             tabDto: tabObject,
-            kind: 0
+            kind: TabModelOperationKind.TAB_OPEN
         });
     }
     _onDidTabClose(groupId, editorIndex) {
@@ -265,7 +266,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             groupId,
             index: editorIndex,
             tabDto: removedTab[0],
-            kind: 1
+            kind: TabModelOperationKind.TAB_CLOSE
         });
     }
     _onDidTabActiveChange(groupId, editorIndex) {
@@ -279,7 +280,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             groupId,
             index: editorIndex,
             tabDto: activeTab,
-            kind: 2
+            kind: TabModelOperationKind.TAB_UPDATE
         });
     }
     _onDidTabDirty(groupId, editorIndex, editor) {
@@ -295,7 +296,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             groupId,
             index: editorIndex,
             tabDto: tabInfo.tab,
-            kind: 2
+            kind: TabModelOperationKind.TAB_UPDATE
         });
     }
     _onDidTabPinChange(groupId, editorIndex, editor) {
@@ -313,7 +314,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             groupId,
             index: editorIndex,
             tabDto: tab,
-            kind: 2
+            kind: TabModelOperationKind.TAB_UPDATE
         });
     }
     _onDidTabPreviewChange(groupId, editorIndex, editor) {
@@ -328,7 +329,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         tab.isPreview = !group.isPinned(editorIndex);
         this._proxy.$acceptTabOperation({
-            kind: 2 ,
+            kind: TabModelOperationKind.TAB_UPDATE,
             groupId,
             tabDto: tab,
             index: editorIndex
@@ -347,7 +348,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         tabs.splice(editorIndex, 0, removedTab[0]);
         this._proxy.$acceptTabOperation({
-            kind: 3 ,
+            kind: TabModelOperationKind.TAB_MOVE,
             groupId,
             tabDto: removedTab[0],
             index: editorIndex,
@@ -389,7 +390,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         const event = changeEvent.event;
         const groupId = changeEvent.groupId;
         switch (event.kind) {
-            case 0 :
+            case GroupModelChangeKind.GROUP_ACTIVE:
                 if (groupId === this._editorGroupsService.activeGroup.id) {
                     this._onDidGroupActivate();
                     break;
@@ -397,44 +398,44 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 else {
                     return;
                 }
-            case 9 :
+            case GroupModelChangeKind.EDITOR_LABEL:
                 if (event.editor !== undefined && event.editorIndex !== undefined) {
                     this._onDidTabLabelChange(groupId, event.editor, event.editorIndex);
                     break;
                 }
-            case 5 :
+            case GroupModelChangeKind.EDITOR_OPEN:
                 if (event.editor !== undefined && event.editorIndex !== undefined) {
                     this._onDidTabOpen(groupId, event.editor, event.editorIndex);
                     break;
                 }
-            case 6 :
+            case GroupModelChangeKind.EDITOR_CLOSE:
                 if (event.editorIndex !== undefined) {
                     this._onDidTabClose(groupId, event.editorIndex);
                     break;
                 }
-            case 8 :
+            case GroupModelChangeKind.EDITOR_ACTIVE:
                 if (event.editorIndex !== undefined) {
                     this._onDidTabActiveChange(groupId, event.editorIndex);
                     break;
                 }
-            case 14 :
+            case GroupModelChangeKind.EDITOR_DIRTY:
                 if (event.editorIndex !== undefined && event.editor !== undefined) {
                     this._onDidTabDirty(groupId, event.editorIndex, event.editor);
                     break;
                 }
-            case 13 :
+            case GroupModelChangeKind.EDITOR_STICKY:
                 if (event.editorIndex !== undefined && event.editor !== undefined) {
                     this._onDidTabPinChange(groupId, event.editorIndex, event.editor);
                     break;
                 }
-            case 11 :
+            case GroupModelChangeKind.EDITOR_PIN:
                 if (event.editorIndex !== undefined && event.editor !== undefined) {
                     this._onDidTabPreviewChange(groupId, event.editorIndex, event.editor);
                     break;
                 }
-            case 12 :
+            case GroupModelChangeKind.EDITOR_TRANSIENT:
                 break;
-            case 7 :
+            case GroupModelChangeKind.EDITOR_MOVE:
                 if (isGroupEditorMoveEvent(event) && event.editor && event.editorIndex !== undefined && event.oldEditorIndex !== undefined) {
                     this._onDidTabMove(groupId, event.editorIndex, event.oldEditorIndex, event.editor);
                     break;
@@ -456,7 +457,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             return;
         }
         if (this._groupLookup.get(groupId) === undefined) {
-            let direction = 3 ;
+            let direction = GroupDirection.RIGHT;
             if (viewColumn === SIDE_GROUP) {
                 direction = preferredSideBySideGroupDirection(this._configurationService);
             }

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

@@ -0,0 +1,60 @@
+import { UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { ICodeEditorService } from "vscode/vscode/vs/editor/browser/services/codeEditorService";
+import { IRange } from "vscode/vscode/vs/editor/common/core/range";
+import { ISelection } from "vscode/vscode/vs/editor/common/core/selection";
+import { IDecorationOptions, IDecorationRenderOptions } from "vscode/vscode/vs/editor/common/editorCommon";
+import { ISingleEditOperation } from "vscode/vscode/vs/editor/common/core/editOperation";
+import { MainThreadTextEditor } from "./mainThreadEditor.js";
+import { IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { ExtensionIdentifier } from "vscode/vscode/vs/platform/extensions/common/extensions";
+import { IChange } from "vscode/vscode/vs/editor/common/diff/legacyLinesDiffComputer";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IEditorControl } from "vscode/vscode/vs/workbench/common/editor";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDirtyDiffModelService } from "vscode/vscode/vs/workbench/contrib/scm/browser/diff.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+export interface IMainThreadEditorLocator {
+    getEditor(id: string): MainThreadTextEditor | undefined;
+    findTextEditorIdFor(editorControl: IEditorControl): string | undefined;
+    getIdOfCodeEditor(codeEditor: ICodeEditor): string | undefined;
+}
+export declare class MainThreadTextEditors implements MainThreadTextEditorsShape {
+    private readonly _editorLocator;
+    private readonly _codeEditorService;
+    private readonly _editorService;
+    private readonly _editorGroupService;
+    private readonly _configurationService;
+    private readonly _dirtyDiffModelService;
+    private readonly _uriIdentityService;
+    private static INSTANCE_COUNT;
+    private readonly _instanceId;
+    private readonly _proxy;
+    private readonly _toDispose;
+    private _textEditorsListenersMap;
+    private _editorPositionData;
+    private _registeredDecorationTypes;
+    constructor(_editorLocator: IMainThreadEditorLocator, extHostContext: IExtHostContext, _codeEditorService: ICodeEditorService, _editorService: IEditorService, _editorGroupService: IEditorGroupsService, _configurationService: IConfigurationService, _dirtyDiffModelService: IDirtyDiffModelService, _uriIdentityService: IUriIdentityService);
+    dispose(): void;
+    handleTextEditorAdded(textEditor: MainThreadTextEditor): void;
+    handleTextEditorRemoved(id: string): void;
+    private _updateActiveAndVisibleTextEditors;
+    private _getTextEditorPositionData;
+    private _getTextEditorDiffInformation;
+    $tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Promise<string | undefined>;
+    $tryShowEditor(id: string, position?: EditorGroupColumn): Promise<void>;
+    $tryHideEditor(id: string): Promise<void>;
+    $trySetSelections(id: string, selections: ISelection[]): Promise<void>;
+    $trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): Promise<void>;
+    $trySetDecorationsFast(id: string, key: string, ranges: number[]): Promise<void>;
+    $tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Promise<void>;
+    $trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Promise<void>;
+    $tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Promise<boolean>;
+    $tryInsertSnippet(id: string, modelVersionId: number, template: string, ranges: readonly IRange[], opts: IUndoStopOptions): Promise<boolean>;
+    $registerTextEditorDecorationType(extensionId: ExtensionIdentifier, key: string, options: IDecorationRenderOptions): void;
+    $removeTextEditorDecorationType(key: string): void;
+    $getDiffInformation(id: string): Promise<IChange[]>;
+}

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

@@ -1,30 +1,42 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { illegalArgument } from 'vscode/vscode/vs/base/common/errors';
 import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { equals } from 'vscode/vscode/vs/base/common/objects';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { EditorActivation, EditorResolution } from 'vscode/vscode/vs/platform/editor/common/editor';
+import { isTextEditorDiffInformationEqual, EditorActivation, EditorResolution } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { getCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IDirtyDiffModelService } from 'vscode/vscode/vs/workbench/contrib/scm/browser/diff.service';
+import { equals as equals$1 } from 'vscode/vscode/vs/base/common/arrays';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { derived, derivedOpts } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/cancellation';
+import { constObservable, observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { isITextModel } from 'vscode/vscode/vs/editor/common/model';
 
 var MainThreadTextEditors_1;
 let MainThreadTextEditors = class MainThreadTextEditors {
     static { MainThreadTextEditors_1 = this; }
     static { this.INSTANCE_COUNT = 0; }
-    constructor(_editorLocator, extHostContext, _codeEditorService, _editorService, _editorGroupService, _configurationService) {
+    constructor(_editorLocator, extHostContext, _codeEditorService, _editorService, _editorGroupService, _configurationService, _dirtyDiffModelService, _uriIdentityService) {
         this._editorLocator = _editorLocator;
         this._codeEditorService = _codeEditorService;
         this._editorService = _editorService;
         this._editorGroupService = _editorGroupService;
         this._configurationService = _configurationService;
+        this._dirtyDiffModelService = _dirtyDiffModelService;
+        this._uriIdentityService = _uriIdentityService;
         this._toDispose = ( new DisposableStore());
         this._instanceId = String(++MainThreadTextEditors_1.INSTANCE_COUNT);
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostEditors));
@@ -52,6 +64,11 @@ let MainThreadTextEditors = class MainThreadTextEditors {
         toDispose.push(textEditor.onPropertiesChanged((data) => {
             this._proxy.$acceptEditorPropertiesChanged(id, data);
         }));
+        const diffInformationObs = this._getTextEditorDiffInformation(textEditor);
+        toDispose.push(autorun(reader => {
+            const diffInformation = diffInformationObs.read(reader);
+            this._proxy.$acceptEditorDiffInformation(id, diffInformation);
+        }));
         this._textEditorsListenersMap[id] = toDispose;
     }
     handleTextEditorRemoved(id) {
@@ -75,6 +92,79 @@ let MainThreadTextEditors = class MainThreadTextEditors {
         }
         return result;
     }
+    _getTextEditorDiffInformation(textEditor) {
+        const codeEditor = textEditor.getCodeEditor();
+        if (!codeEditor) {
+            return constObservable(undefined);
+        }
+        const diffEditors = this._codeEditorService.listDiffEditors();
+        const [diffEditor] = diffEditors.filter(d => d.getOriginalEditor().getId() === codeEditor.getId() ||
+            d.getModifiedEditor().getId() === codeEditor.getId());
+        const editorModelObs = diffEditor
+            ? observableFromEvent(this, diffEditor.onDidChangeModel, () => diffEditor.getModel())
+            : observableFromEvent(this, codeEditor.onDidChangeModel, () => codeEditor.getModel());
+        const editorChangesObs = derived(reader => {
+            const editorModel = editorModelObs.read(reader);
+            if (!editorModel) {
+                return constObservable(undefined);
+            }
+            const editorModelUri = isITextModel(editorModel)
+                ? editorModel.uri
+                : editorModel.modified.uri;
+            if (isITextModel(editorModel)) {
+                const dirtyDiffModel = this._dirtyDiffModelService.getDirtyDiffModel(editorModelUri);
+                if (!dirtyDiffModel) {
+                    return constObservable(undefined);
+                }
+                return observableFromEvent(this, dirtyDiffModel.onDidChange, () => {
+                    return dirtyDiffModel.getQuickDiffResults();
+                });
+            }
+            const diffAlgorithm = this._configurationService.getValue('diffEditor.diffAlgorithm');
+            const dirtyDiffModel = this._dirtyDiffModelService.getDiffModel(editorModelUri, diffAlgorithm);
+            if (!dirtyDiffModel) {
+                return constObservable(undefined);
+            }
+            return observableFromEvent(Event.any(dirtyDiffModel.onDidChange, diffEditor.onDidUpdateDiff), () => {
+                const dirtyDiffInformation = dirtyDiffModel.getQuickDiffResults();
+                const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
+                const diffInformation = [{
+                        original: editorModel.original.uri,
+                        modified: editorModel.modified.uri,
+                        changes: ( diffChanges.map(change => change))
+                    }];
+                return [...dirtyDiffInformation, ...diffInformation];
+            });
+        });
+        return derivedOpts({
+            owner: this,
+            equalsFn: (diff1, diff2) => equals$1(diff1, diff2, (a, b) => isTextEditorDiffInformationEqual(this._uriIdentityService, a, b))
+        }, reader => {
+            const editorModel = editorModelObs.read(reader);
+            const editorChanges = editorChangesObs.read(reader).read(reader);
+            if (!editorModel || !editorChanges) {
+                return undefined;
+            }
+            const documentVersion = isITextModel(editorModel)
+                ? editorModel.getVersionId()
+                : editorModel.modified.getVersionId();
+            return ( editorChanges.map(change => {
+                const changes = ( change.changes
+                    .map(change => [
+                    change.original.startLineNumber,
+                    change.original.endLineNumberExclusive,
+                    change.modified.startLineNumber,
+                    change.modified.endLineNumberExclusive
+                ]));
+                return {
+                    documentVersion,
+                    original: change.original,
+                    modified: change.modified,
+                    changes
+                };
+            }));
+        });
+    }
     async $tryShowTextDocument(resource, options) {
         const uri = URI.revive(resource);
         const editorOptions = {
@@ -211,7 +301,9 @@ MainThreadTextEditors = MainThreadTextEditors_1 = ( __decorate([
     ( __param(2, ICodeEditorService)),
     ( __param(3, IEditorService)),
     ( __param(4, IEditorGroupsService)),
-    ( __param(5, IConfigurationService))
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IDirtyDiffModelService)),
+    ( __param(7, IUriIdentityService))
 ], MainThreadTextEditors));
 CommandsRegistry.registerCommand('_workbench.revertAllDirty', async function (accessor) {
     const environmentService = accessor.get(IEnvironmentService);

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

@@ -0,0 +1,34 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { MainThreadEmbeddingsShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+interface IEmbeddingsProvider {
+    provideEmbeddings(input: string[], token: CancellationToken): Promise<{
+        values: number[];
+    }[]>;
+}
+declare const IEmbeddingsService: import("vscode/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<IEmbeddingsService>;
+interface IEmbeddingsService {
+    _serviceBrand: undefined;
+    readonly onDidChange: Event<void>;
+    allProviders: Iterable<string>;
+    registerProvider(id: string, provider: IEmbeddingsProvider): IDisposable;
+    computeEmbeddings(id: string, input: string[], token: CancellationToken): Promise<{
+        values: number[];
+    }[]>;
+}
+export declare class MainThreadEmbeddings implements MainThreadEmbeddingsShape {
+    private readonly embeddingsService;
+    private readonly _store;
+    private readonly _providers;
+    private readonly _proxy;
+    constructor(context: IExtHostContext, embeddingsService: IEmbeddingsService);
+    dispose(): void;
+    $registerEmbeddingProvider(handle: number, identifier: string): void;
+    $unregisterEmbeddingProvider(handle: number): void;
+    $computeEmbeddings(embeddingsModel: string, input: string[], token: CancellationToken): Promise<{
+        values: number[];
+    }[]>;
+}
+export {};

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

@@ -1,7 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerSingleton } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { registerSingleton, InstantiationType } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -36,7 +37,7 @@ class EmbeddingsService {
         }
     }
 }
-registerSingleton(IEmbeddingsService, EmbeddingsService, 1 );
+registerSingleton(IEmbeddingsService, EmbeddingsService, InstantiationType.Delayed);
 let MainThreadEmbeddings = class MainThreadEmbeddings {
     constructor(context, embeddingsService) {
         this.embeddingsService = embeddingsService;

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

@@ -0,0 +1,6 @@
+import { SerializedError } from "vscode/vscode/vs/base/common/errors";
+import { MainThreadErrorsShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadErrors implements MainThreadErrorsShape {
+    dispose(): void;
+    $onUnexpectedError(err: any | SerializedError): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate } from 'vscode/external/tslib/tslib.es6';
 import { transformErrorFromSerialization, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';

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

@@ -0,0 +1,42 @@
+import { SerializedError } from "vscode/vscode/vs/base/common/errors";
+import { UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { ExtensionIdentifier } from "vscode/vscode/vs/platform/extensions/common/extensions";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { MainThreadExtensionServiceShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtensionsWorkbenchService } from "vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IWorkbenchExtensionEnablementService } from "vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
+import { ExtensionActivationReason, MissingExtensionDependency } from "vscode/vscode/vs/workbench/services/extensions/common/extensions";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IHostService } from "vscode/vscode/vs/workbench/services/host/browser/host.service";
+import { ITimerService } from "vscode/vscode/vs/workbench/services/timer/browser/timerService.service";
+export declare class MainThreadExtensionService implements MainThreadExtensionServiceShape {
+    private readonly _extensionService;
+    private readonly _notificationService;
+    private readonly _extensionsWorkbenchService;
+    private readonly _hostService;
+    private readonly _extensionEnablementService;
+    private readonly _timerService;
+    private readonly _commandService;
+    protected readonly _environmentService: IWorkbenchEnvironmentService;
+    private readonly _extensionHostKind;
+    private readonly _internalExtensionService;
+    constructor(extHostContext: IExtHostContext, _extensionService: IExtensionService, _notificationService: INotificationService, _extensionsWorkbenchService: IExtensionsWorkbenchService, _hostService: IHostService, _extensionEnablementService: IWorkbenchExtensionEnablementService, _timerService: ITimerService, _commandService: ICommandService, _environmentService: IWorkbenchEnvironmentService);
+    dispose(): void;
+    $getExtension(extensionId: string): Promise<Readonly<import("vscode/vscode/vs/platform/extensions/common/extensions").IRelaxedExtensionDescription> | undefined>;
+    $activateExtension(extensionId: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<void>;
+    $onWillActivateExtension(extensionId: ExtensionIdentifier): Promise<void>;
+    $onDidActivateExtension(extensionId: ExtensionIdentifier, codeLoadingTime: number, activateCallTime: number, activateResolvedTime: number, activationReason: ExtensionActivationReason): void;
+    $onExtensionRuntimeError(extensionId: ExtensionIdentifier, data: SerializedError): void;
+    $onExtensionActivationError(extensionId: ExtensionIdentifier, data: SerializedError, missingExtensionDependency: MissingExtensionDependency | null): Promise<void>;
+    private _handleMissingInstalledDependency;
+    private _handleMissingNotInstalledDependency;
+    $setPerformanceMarks(marks: PerformanceMark[]): Promise<void>;
+    $asBrowserUri(uri: UriComponents): Promise<UriComponents>;
+    $getAllStaticBrowserUris(): Promise<[
+        UriComponents,
+        UriComponents
+    ][]>;
+}