@codingame/monaco-vscode-extensions-service-override 18.3.1 → 19.0.0

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

@@ -10,7 +10,7 @@ import { ICommentController } from "@codingame/monaco-vscode-comments-service-ov
 import { ICommentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentService.service";
 import { CommentProviderFeatures, ExtHostCommentsShape, MainThreadCommentsShape, CommentThreadChanges } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { ICellRange } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { MarshalledCommentThread } from "../../common/comments.js";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";

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

@@ -424,7 +424,7 @@ class MainThreadCommentController extends Disposable {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2404, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2419, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();

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

@@ -12,7 +12,7 @@ export declare class MainThreadConfiguration implements MainThreadConfigurationS
     constructor(extHostContext: IExtHostContext, _workspaceContextService: IWorkspaceContextService, configurationService: IConfigurationService, _environmentService: IEnvironmentService);
     private _getConfigurationData;
     dispose(): void;
-    $updateConfigurationOption(target: ConfigurationTarget | null, key: string, value: any, overrides: IConfigurationOverrides | undefined, scopeToLanguage: boolean | undefined): Promise<void>;
+    $updateConfigurationOption(target: ConfigurationTarget | null, key: string, value: unknown, overrides: IConfigurationOverrides | undefined, scopeToLanguage: boolean | undefined): Promise<void>;
     $removeConfigurationOption(target: ConfigurationTarget | null, key: string, overrides: IConfigurationOverrides | undefined, scopeToLanguage: boolean | undefined): Promise<void>;
     private writeConfiguration;
     private _updateValue;

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

@@ -25,16 +25,16 @@ import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { CustomTextEditorModel } from '../../contrib/customEditor/common/customTextEditorModel.js';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
 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 { editorGroupToColumn } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 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 { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { ResourceWorkingCopy } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { NO_TYPE_ID, WorkingCopyCapabilities } from '@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { ResourceWorkingCopy } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
+import { NO_TYPE_ID, WorkingCopyCapabilities } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
@@ -148,7 +148,8 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
                     });
                 }
                 try {
-                    await this._proxyCustomEditors.$resolveCustomEditor(this._uriIdentityService.asCanonicalUri(resource), handle, viewType, {
+                    const actualResource = modelType === CustomEditorModelType.Text ? this._uriIdentityService.asCanonicalUri(resource) : resource;
+                    await this._proxyCustomEditors.$resolveCustomEditor(actualResource, handle, viewType, {
                         title: webviewInput.getTitle(),
                         contentOptions: webviewInput.webview.contentOptions,
                         options: webviewInput.webview.options,
@@ -302,7 +303,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2405,
+                    2420,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -370,7 +371,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2406, "Edit")),
+            label: label ?? ( localize(2421, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

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

@@ -10,6 +10,8 @@ export declare class MainThreadDiagnostics implements MainThreadDiagnosticsShape
     private readonly _activeOwners;
     private readonly _proxy;
     private readonly _markerListener;
+    private static ExtHostCounter;
+    private readonly extHostId;
     constructor(extHostContext: IExtHostContext, _markerService: IMarkerService, _uriIdentService: IUriIdentityService);
     dispose(): void;
     private _forwardMarkers;

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

@@ -5,18 +5,38 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 
+var MainThreadDiagnostics_1;
 let MainThreadDiagnostics = class MainThreadDiagnostics {
+    static { MainThreadDiagnostics_1 = this; }
+    static { this.ExtHostCounter = 1; }
     constructor(extHostContext, _markerService, _uriIdentService) {
         this._markerService = _markerService;
         this._uriIdentService = _uriIdentService;
         this._activeOwners = ( new Set());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostDiagnostics));
         this._markerListener = this._markerService.onMarkerChanged(this._forwardMarkers, this);
+        this.extHostId = `extHost${MainThreadDiagnostics_1.ExtHostCounter++}`;
     }
     dispose() {
         this._markerListener.dispose();
-        this._activeOwners.forEach(owner => this._markerService.changeAll(owner, []));
+        for (const owner of this._activeOwners) {
+            const markersData = ( new ResourceMap());
+            for (const marker of this._markerService.read({ owner })) {
+                let data = markersData.get(marker.resource);
+                if (data === undefined) {
+                    data = [];
+                    markersData.set(marker.resource, data);
+                }
+                if (marker.origin !== this.extHostId) {
+                    data.push(marker);
+                }
+            }
+            for (const [resource, local] of markersData.entries()) {
+                this._markerService.changeOne(owner, resource, local);
+            }
+        }
         this._activeOwners.clear();
     }
     _forwardMarkers(resources) {
@@ -27,9 +47,9 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
                 data.push([resource, []]);
             }
             else {
-                const forgeinMarkerData = allMarkerData.filter(marker => !( this._activeOwners.has(marker.owner)));
-                if (forgeinMarkerData.length > 0) {
-                    data.push([resource, forgeinMarkerData]);
+                const foreignMarkerData = allMarkerData.filter(marker => marker?.origin !== this.extHostId);
+                if (foreignMarkerData.length > 0) {
+                    data.push([resource, foreignMarkerData]);
                 }
             }
         }
@@ -50,6 +70,9 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
                     if (marker.code && typeof marker.code !== 'string') {
                         marker.code.target = URI.revive(marker.code.target);
                     }
+                    if (marker.origin === undefined) {
+                        marker.origin = this.extHostId;
+                    }
                 }
             }
             this._markerService.changeOne(owner, this._uriIdentService.asCanonicalUri(URI.revive(uri)), markers);
@@ -61,7 +84,7 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
         this._activeOwners.delete(owner);
     }
 };
-MainThreadDiagnostics = __decorate([
+MainThreadDiagnostics = MainThreadDiagnostics_1 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadDiagnostics),
     ( __param(1, IMarkerService)),
     ( __param(2, IUriIdentityService))

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

@@ -19,7 +19,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { onUnexpectedError, ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 class BoundModelReferenceCollection {
     constructor(_extUri, _maxAge = 1000 * 60 * 3,
@@ -79,7 +79,20 @@ class ModelTracker extends Disposable {
         this._knownVersionId = this._model.getVersionId();
         this._store.add(this._model.onDidChangeContent((e) => {
             this._knownVersionId = e.versionId;
-            this._proxy.$acceptModelChanged(this._model.uri, e, this._textFileService.isDirty(this._model.uri));
+            if (e.detailedReasonsChangeLengths.length !== 1) {
+                onUnexpectedError(( new Error(`Unexpected reasons: ${( e.detailedReasons.map(r => ( r.toString())))}`)));
+            }
+            const evt = {
+                changes: e.changes,
+                isEolChange: e.isEolChange,
+                isUndoing: e.isUndoing,
+                isRedoing: e.isRedoing,
+                isFlush: e.isFlush,
+                eol: e.eol,
+                versionId: e.versionId,
+                detailedReason: e.detailedReasons[0].metadata,
+            };
+            this._proxy.$acceptModelChanged(this._model.uri, evt, this._textFileService.isDirty(this._model.uri));
             if (this.isCaughtUpWithContentChanges()) {
                 this._onIsCaughtUpWithContentChanges.fire(this._model.uri);
             }
@@ -248,6 +261,9 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
             initialValue: options?.content,
             encoding: options?.encoding
         });
+        if (options?.encoding) {
+            await model.setEncoding(options.encoding);
+        }
         const resource = model.resource;
         const ref = await this._textModelResolverService.createModelReference(resource);
         if (!( this._modelTrackers.has(resource))) {

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

@@ -13,7 +13,7 @@ import { MainThreadDocuments } from './mainThreadDocuments.js';
 import { MainThreadTextEditor } from './mainThreadEditor.js';
 import { MainThreadTextEditors } from './mainThreadEditors.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';

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(2407, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2422, "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.d.ts

@@ -1,7 +1,7 @@
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { MainThreadEditorTabsShape } from "@codingame/monaco-vscode-api/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 { EditorGroupColumn } from "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 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/mainThreadEditorTabs.js

@@ -9,18 +9,18 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 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-9c72783f-914c-50be-b9ef-da16356d81a8-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 { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/common/editor/editorGroupModel';
 import { SideBySideEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-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-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+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-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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 { WebviewInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-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';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';

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

@@ -6,7 +6,7 @@ import { IDecorationOptions, IDecorationRenderOptions } from "@codingame/monaco-
 import { ISingleEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation";
 import { MainThreadTextEditor } from "./mainThreadEditor.js";
 import { IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from "@codingame/monaco-vscode-api/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 { EditorGroupColumn } from "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";

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

@@ -8,7 +8,7 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { isTextEditorDiffInformationEqual, EditorResolution, EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';

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(
-                    2408,
+                    2423,
                     "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(2409, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2424, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2410,
+                        2425,
                         "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(
-                        2411,
+                        2426,
                         "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(2412, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2427, "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(
-                        2413,
+                        2428,
                         "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(2414, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2429, "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(
-                        2415,
+                        2430,
                         "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(
-                    2416,
+                    2431,
                     "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(2417, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2432, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2418,
+                2433,
                 "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(
-                                2419,
+                                2434,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2420,
+                                2435,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2421,
+                                2436,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2422,
+                                2437,
                                 "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(
-                                2423,
+                                2438,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2424,
+                                2439,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2425,
+                                2440,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2426,
+                                2441,
                                 "{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(2427, "Show &&Preview")),
-                            cancelButton: ( localize(2428, "Skip Changes"))
+                            primaryButton: ( localize(2442, "Show &&Preview")),
+                            cancelButton: ( localize(2443, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2429, "&&OK")),
+                                    label: ( localize(2444, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2427, "Show &&Preview")),
+                                    label: ( localize(2442, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2428, "Skip Changes")),
+                                label: ( localize(2443, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2430, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2445, "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(2431, "Running 'File Create' participants...");
+                        return localize(2446, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2432, "Running 'File Rename' participants...");
+                        return localize(2447, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2433, "Running 'File Copy' participants...");
+                        return localize(2448, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2434, "Running 'File Delete' participants...");
+                        return localize(2449, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2435, "Running 'File Write' participants...");
+                        return localize(2450, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2436, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2451, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -12,14 +12,16 @@ import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 export declare class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
     private readonly _languageService;
     private readonly _languageConfigurationService;
     private readonly _languageFeaturesService;
     private readonly _uriIdentService;
+    private readonly _telemetryService;
     private readonly _proxy;
     private readonly _registrations;
-    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService);
+    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService, _telemetryService: ITelemetryService);
     $unregister(handle: number): void;
     private static _reviveLocationDto;
     private static _reviveLocationLinkDto;
@@ -58,9 +60,8 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
     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[], displayName: string | undefined, debounceDelayMs: number | undefined, eventHandle: number | undefined): void;
+    $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, eventHandle: number | undefined): void;
     $emitInlineCompletionsChange(handle: number): 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;