@codingame/monaco-vscode-extensions-service-override 9.0.2 → 10.0.0

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

@@ -1,41 +1,31 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
-import { GLOBSTAR } from 'vscode/vscode/vs/base/common/glob';
-import { rtrim } from 'vscode/vscode/vs/base/common/strings';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { normalizeWatcherPattern } from 'vscode/vscode/vs/platform/files/common/watcher';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 
 var MainThreadFileSystemEventService_1;
 let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
     static { MainThreadFileSystemEventService_1 = this; }
     static { this.MementoKeyAdditionalEdits = `file.particpants.additionalEdits`; }
-    constructor(extHostContext, _fileService, workingCopyFileService, bulkEditService, progressService, dialogService, storageService, logService, envService, uriIdentService, _contextService, _logService, _configurationService) {
+    constructor(extHostContext, _fileService, workingCopyFileService, bulkEditService, progressService, dialogService, storageService, logService, envService, uriIdentService, _logService) {
         this._fileService = _fileService;
-        this._contextService = _contextService;
         this._logService = _logService;
-        this._configurationService = _configurationService;
         this._listener = ( (new DisposableStore()));
         this._watches = ( (new DisposableMap()));
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostFileSystemEventService)));
@@ -55,7 +45,7 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                 const cts = ( (new CancellationTokenSource(token)));
                 const timer = setTimeout(() => cts.cancel(), timeout);
                 const data = await progressService.withProgress({
-                    location: ProgressLocation.Notification,
+                    location: 15 ,
                     title: this._progressLabel(operation),
                     cancellable: true,
                     delay: Math.min(timeout / 2, 3000)
@@ -72,67 +62,67 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     return;
                 }
                 const needsConfirmation = ( (data.edit.edits.some(edit => edit.metadata?.needsConfirmation)));
-                let showPreview = storageService.getBoolean(MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits, StorageScope.PROFILE);
+                let showPreview = storageService.getBoolean(MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits, 0 );
                 if (envService.extensionTestsLocationURI) {
                     showPreview = false;
                 }
                 if (showPreview === undefined) {
                     let message;
                     if (data.extensionNames.length === 1) {
-                        if (operation === FileOperation.CREATE) {
+                        if (operation === 0 ) {
                             message = ( localize(
-                                4815,
+                                4846,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
-                        else if (operation === FileOperation.COPY) {
+                        else if (operation === 3 ) {
                             message = ( localize(
-                                4816,
+                                4847,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
-                        else if (operation === FileOperation.MOVE) {
+                        else if (operation === 2 ) {
                             message = ( localize(
-                                4817,
+                                4848,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                4818,
+                                4849,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
                         }
                     }
                     else {
-                        if (operation === FileOperation.CREATE) {
+                        if (operation === 0 ) {
                             message = ( localize(
-                                4819,
+                                4850,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
-                        else if (operation === FileOperation.COPY) {
+                        else if (operation === 3 ) {
                             message = ( localize(
-                                4820,
+                                4851,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
-                        else if (operation === FileOperation.MOVE) {
+                        else if (operation === 2 ) {
                             message = ( localize(
-                                4821,
+                                4852,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                4822,
+                                4853,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -142,8 +132,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity$1.Info,
                             message,
-                            primaryButton: ( localize(4823, "Show &&Preview")),
-                            cancelButton: ( localize(4824, "Skip Changes"))
+                            primaryButton: ( localize(4854, "Show &&Preview")),
+                            cancelButton: ( localize(4855, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -162,26 +152,26 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(4825, "&&OK")),
+                                    label: ( localize(4856, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(4823, "Show &&Preview")),
+                                    label: ( localize(4854, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(4824, "Skip Changes")),
+                                label: ( localize(4855, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(4826, "Do not ask me again")) }
+                            checkbox: { label: ( localize(4857, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
                         }
                         showPreview = result === Choice.Preview;
                         if (checkboxChecked) {
-                            storageService.store(MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits, showPreview, StorageScope.PROFILE, StorageTarget.USER);
+                            storageService.store(MainThreadFileSystemEventService_1.MementoKeyAdditionalEdits, showPreview, 0 , 0 );
                         }
                     }
                 }
@@ -190,16 +180,16 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             }
             _progressLabel(operation) {
                 switch (operation) {
-                    case FileOperation.CREATE:
-                        return ( localize(4827, "Running 'File Create' participants..."));
-                    case FileOperation.MOVE:
-                        return ( localize(4828, "Running 'File Rename' participants..."));
-                    case FileOperation.COPY:
-                        return ( localize(4829, "Running 'File Copy' participants..."));
-                    case FileOperation.DELETE:
-                        return ( localize(4830, "Running 'File Delete' participants..."));
-                    case FileOperation.WRITE:
-                        return ( localize(4831, "Running 'File Write' participants..."));
+                    case 0 :
+                        return ( localize(4858, "Running 'File Create' participants..."));
+                    case 2 :
+                        return ( localize(4859, "Running 'File Rename' participants..."));
+                    case 3 :
+                        return ( localize(4860, "Running 'File Copy' participants..."));
+                    case 1 :
+                        return ( localize(4861, "Running 'File Delete' participants..."));
+                    case 4 :
+                        return ( localize(4862, "Running 'File Write' participants..."));
                 }
             }
         });
@@ -222,7 +212,7 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             }
         }
         if (correlate) {
-            this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${( (uri.toString(true)))}, recursive: ${opts.recursive}, session: ${session})`);
+            this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching correlated (extension: ${extensionId}, path: ${( (uri.toString(true)))}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`);
             const watcherDisposables = ( (new DisposableStore()));
             const subscription = watcherDisposables.add(this._fileService.createWatcher(uri, opts));
             watcherDisposables.add(subscription.onDidChange(event => {
@@ -236,36 +226,7 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             this._watches.set(session, watcherDisposables);
         }
         else {
-            this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching uncorrelated (extension: ${extensionId}, path: ${( (uri.toString(true)))}, recursive: ${opts.recursive}, session: ${session})`);
-            const workspaceFolder = this._contextService.getWorkspaceFolder(uri);
-            if (opts.recursive && opts.excludes.length === 0) {
-                const config = this._configurationService.getValue();
-                if (config.files?.watcherExclude) {
-                    for (const key in config.files.watcherExclude) {
-                        if (key && config.files.watcherExclude[key] === true) {
-                            opts.excludes.push(key);
-                        }
-                    }
-                }
-            }
-            else if (!opts.recursive && workspaceFolder) {
-                const config = this._configurationService.getValue();
-                if (config.files?.watcherExclude) {
-                    for (const key in config.files.watcherExclude) {
-                        if (key && config.files.watcherExclude[key] === true) {
-                            if (!opts.includes) {
-                                opts.includes = [];
-                            }
-                            const includePattern = `${rtrim(key, '/')}/${GLOBSTAR}`;
-                            opts.includes.push(normalizeWatcherPattern(workspaceFolder.uri.fsPath, includePattern));
-                        }
-                    }
-                }
-                if (!opts.includes || opts.includes.length === 0) {
-                    this._logService.trace(`MainThreadFileSystemEventService#$watch(): ignoring request to start watching because path is inside workspace and no excludes are configured (extension: ${extensionId}, path: ${( (uri.toString(true)))}, recursive: ${opts.recursive}, session: ${session})`);
-                    return;
-                }
-            }
+            this._logService.trace(`MainThreadFileSystemEventService#$watch(): request to start watching uncorrelated (extension: ${extensionId}, path: ${( (uri.toString(true)))}, recursive: ${opts.recursive}, session: ${session}, excludes: ${JSON.stringify(opts.excludes)}, includes: ${JSON.stringify(opts.includes)})`);
             const subscription = this._fileService.watch(uri, opts);
             this._watches.set(session, subscription);
         }
@@ -292,23 +253,21 @@ MainThreadFileSystemEventService = MainThreadFileSystemEventService_1 = __decora
     ( (__param(7, ILogService))),
     ( (__param(8, IEnvironmentService))),
     ( (__param(9, IUriIdentityService))),
-    ( (__param(10, IWorkspaceContextService))),
-    ( (__param(11, ILogService))),
-    ( (__param(12, IConfigurationService)))
+    ( (__param(10, ILogService)))
 ], MainThreadFileSystemEventService);
 registerAction2(class ResetMemento extends Action2 {
     constructor() {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(4832, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(4863, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove(MainThreadFileSystemEventService.MementoKeyAdditionalEdits, StorageScope.PROFILE);
+        accessor.get(IStorageService).remove(MainThreadFileSystemEventService.MementoKeyAdditionalEdits, 0 );
     }
 });
 

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

@@ -8,7 +8,6 @@ import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { mixin } from 'vscode/vscode/vs/base/common/objects';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILanguageConfigurationService } from 'vscode/vscode/vs/editor/common/languages/languageConfigurationRegistry';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -21,7 +20,7 @@ import { CallHierarchyProviderRegistry } from 'vscode/vscode/vs/workbench/contri
 import { WorkspaceSymbolProviderRegistry } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { TypeHierarchyProviderRegistry } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
 var MainThreadLanguageFeatures_1;
 let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
@@ -427,30 +426,30 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         this._registrations.set(handle, this._languageFeaturesService.documentRangeSemanticTokensProvider.register(selector, ( new MainThreadDocumentRangeSemanticTokensProvider(this._proxy, handle, legend))));
     }
     static _inflateSuggestDto(defaultRange, data, extensionId) {
-        const label = data[ISuggestDataDtoField.label];
-        const commandId = data[ISuggestDataDtoField.commandId];
-        const commandIdent = data[ISuggestDataDtoField.commandIdent];
-        const commitChars = data[ISuggestDataDtoField.commitCharacters];
+        const label = data["a" ];
+        const commandId = data["o" ];
+        const commandIdent = data["n" ];
+        const commitChars = data["k" ];
         return {
             label,
             extensionId,
-            kind: data[ISuggestDataDtoField.kind] ?? CompletionItemKind.Property,
-            tags: data[ISuggestDataDtoField.kindModifier],
-            detail: data[ISuggestDataDtoField.detail],
-            documentation: data[ISuggestDataDtoField.documentation],
-            sortText: data[ISuggestDataDtoField.sortText],
-            filterText: data[ISuggestDataDtoField.filterText],
-            preselect: data[ISuggestDataDtoField.preselect],
-            insertText: data[ISuggestDataDtoField.insertText] ?? (typeof label === 'string' ? label : label.label),
-            range: data[ISuggestDataDtoField.range] ?? defaultRange,
-            insertTextRules: data[ISuggestDataDtoField.insertTextRules],
+            kind: data["b" ] ?? 9 ,
+            tags: data["m" ],
+            detail: data["c" ],
+            documentation: data["d" ],
+            sortText: data["e" ],
+            filterText: data["f" ],
+            preselect: data["g" ],
+            insertText: data["h" ] ?? (typeof label === 'string' ? label : label.label),
+            range: data["j" ] ?? defaultRange,
+            insertTextRules: data["i" ],
             commitCharacters: commitChars ? Array.from(commitChars) : undefined,
-            additionalTextEdits: data[ISuggestDataDtoField.additionalTextEdits],
+            additionalTextEdits: data["l" ],
             command: commandId ? {
                 $ident: commandIdent,
                 id: commandId,
                 title: '',
-                arguments: commandIdent ? [commandIdent] : data[ISuggestDataDtoField.commandArguments],
+                arguments: commandIdent ? [commandIdent] : data["p" ],
             } : undefined,
             _id: data.x,
         };
@@ -465,11 +464,11 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     return result;
                 }
                 return {
-                    suggestions: ( result[ISuggestResultDtoField.completions].map(
-                        d => MainThreadLanguageFeatures_1._inflateSuggestDto(result[ISuggestResultDtoField.defaultRanges], d, extensionId)
+                    suggestions: ( result["b" ].map(
+                        d => MainThreadLanguageFeatures_1._inflateSuggestDto(result["a" ], d, extensionId)
                     )),
-                    incomplete: result[ISuggestResultDtoField.isIncomplete] || false,
-                    duration: result[ISuggestResultDtoField.duration],
+                    incomplete: result["c" ] || false,
+                    duration: result["d" ],
                     dispose: () => {
                         if (typeof result.x === 'number') {
                             this._proxy.$releaseCompletionItems(handle, result.x);
@@ -496,8 +495,8 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             provideInlineCompletions: async (model, position, context, token) => {
                 return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
             },
-            provideInlineEdits: async (model, range, context, token) => {
-                return this._proxy.$provideInlineEdits(handle, model.uri, range, context, token);
+            provideInlineEditsForRange: async (model, range, context, token) => {
+                return this._proxy.$provideInlineEditsForRange(handle, model.uri, range, context, token);
             },
             handleItemDidShow: async (completions, item, updatedInsertText) => {
                 if (supportsHandleEvents) {

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
 let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Disposable {
     constructor(extHostContext, _languageModelToolsService) {
@@ -16,8 +16,8 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
     async $getTools() {
         return Array.from(this._languageModelToolsService.getTools());
     }
-    $invokeTool(dto, token) {
-        return this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token);
+    async $invokeTool(dto, token) {
+        return await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token);
     }
     $countTokensForInvocation(callId, input, token) {
         const fn = this._countTokenCallbacks.get(callId);
@@ -26,8 +26,8 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
         }
         return fn(input, token);
     }
-    $registerTool(name) {
-        const disposable = this._languageModelToolsService.registerToolImplementation(name, {
+    $registerTool(id) {
+        const disposable = this._languageModelToolsService.registerToolImplementation(id, {
             invoke: async (dto, countTokens, token) => {
                 try {
                     this._countTokenCallbacks.set(dto.callId, countTokens);
@@ -37,8 +37,10 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
                     this._countTokenCallbacks.delete(dto.callId);
                 }
             },
+            provideToolConfirmationMessages: (participantName, parameters, token) => this._proxy.$provideToolConfirmationMessages(id, participantName, parameters, token),
+            provideToolInvocationMessage: (parameters, token) => this._proxy.$provideToolInvocationMessage(id, parameters, token),
         });
-        this._tools.set(name, disposable);
+        this._tools.set(id, disposable);
     }
     $unregisterTool(name) {
         this._tools.deleteAndDispose(name);

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

@@ -129,7 +129,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(4802, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(4833, '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/mainThreadManagedSockets.js

@@ -1,9 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { SocketCloseEventType } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
 import { ManagedSocket, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
-import { RemoteConnectionType } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -47,7 +45,7 @@ let MainThreadManagedSockets = class MainThreadManagedSockets extends Disposable
                 }));
             }
         });
-        this._registrations.set(socketFactoryId, this._remoteSocketFactoryService.register(RemoteConnectionType.Managed, socketFactory));
+        this._registrations.set(socketFactoryId, this._remoteSocketFactoryService.register(1 , socketFactory));
     }
     async $unregisterSocketFactory(socketFactoryId) {
         this._registrations.get(socketFactoryId)?.dispose();
@@ -57,7 +55,7 @@ let MainThreadManagedSockets = class MainThreadManagedSockets extends Disposable
     }
     $onDidManagedSocketClose(socketId, error) {
         this._remoteSockets.get(socketId)?.onClose.fire({
-            type: SocketCloseEventType.NodeSocketCloseEvent,
+            type: 0 ,
             error: error ? ( new Error(error)) : undefined,
             hadError: !!error
         });

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

@@ -51,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                     };
                 }
                 if (!source) {
-                    source = ( localize(4833, "Extension"));
+                    source = ( localize(4864, "Extension"));
                 }
                 const secondaryActions = [];
                 if (options.source) {
                     secondaryActions.push(toAction({
                         id: options.source.identifier.value,
-                        label: ( localize(4834, "Manage Extension")),
+                        label: ( localize(4865, "Manage Extension")),
                         run: () => {
                             return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                         }
@@ -93,13 +93,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(4835, "Cancel")),
+                    label: ( localize(4866, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(4836, "&&OK")),
+                    label: ( localize(4867, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -171,7 +171,8 @@ let MainThreadNotebooksAndEditors = MainThreadNotebooksAndEditors_1 = class Main
             documentUri: add.textModel.uri,
             selections: add.getSelections(),
             visibleRanges: add.visibleRanges,
-            viewColumn: pane && editorGroupToColumn(this._editorGroupService, pane.group)
+            viewColumn: pane && editorGroupToColumn(this._editorGroupService, pane.group),
+            viewType: add.getViewModel().viewType
         };
     }
 };

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

@@ -1,4 +1,3 @@
-import { CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 
 var NotebookDto;
@@ -112,7 +111,7 @@ var NotebookDto;
     }
     NotebookDto.fromCellExecuteCompleteDto = fromCellExecuteCompleteDto;
     function fromCellEditOperationDto(edit) {
-        if (edit.editType === CellEditType.Replace) {
+        if (edit.editType === 1 ) {
             return {
                 editType: edit.editType,
                 index: edit.index,

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

@@ -3,7 +3,7 @@ import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { DisposableMap, DisposableStore, toDisposable, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { NotebookDto } from './mainThreadNotebookDto.js';
@@ -109,6 +109,16 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
                 this._proxy.$cellExecutionChanged(e.notebook, e.cellHandle, e.changed?.state);
             }
         }));
+        this._disposables.add(this._notebookKernelService.onDidChangeSelectedNotebooks(e => {
+            for (const [handle, [kernel,]] of this._kernels) {
+                if (e.oldKernel === kernel.id) {
+                    this._proxy.$acceptNotebookAssociation(handle, e.notebook, false);
+                }
+                else if (e.newKernel === kernel.id) {
+                    this._proxy.$acceptNotebookAssociation(handle, e.notebook, true);
+                }
+            }
+        }));
     }
     dispose() {
         this._disposables.dispose();
@@ -202,16 +212,9 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
                 return source.asyncIterable;
             }
         })(data, this._languageService);
-        const listener = this._notebookKernelService.onDidChangeSelectedNotebooks(e => {
-            if (e.oldKernel === kernel.id) {
-                this._proxy.$acceptNotebookAssociation(handle, e.notebook, false);
-            }
-            else if (e.newKernel === kernel.id) {
-                this._proxy.$acceptNotebookAssociation(handle, e.notebook, true);
-            }
-        });
-        const registration = this._notebookKernelService.registerKernel(kernel);
-        this._kernels.set(handle, [kernel, combinedDisposable(listener, registration)]);
+        const disposables = this._disposables.add(( new DisposableStore()));
+        this._kernels.set(handle, [kernel, disposables]);
+        disposables.add(this._notebookKernelService.registerKernel(kernel));
     }
     $updateKernel(handle, data) {
         const tuple = this._kernels.get(handle);

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

@@ -17,7 +17,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( (new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( (new Error(( localize(4848, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( (new Error(( localize(4879, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -27,11 +26,11 @@ let MainThreadProgress = class MainThreadProgress {
     }
     async $startProgress(handle, options, extensionId) {
         const task = this._createTask(handle);
-        if (options.location === ProgressLocation.Notification && extensionId) {
+        if (options.location === 15  && extensionId) {
             const notificationOptions = {
                 ...options,
-                location: ProgressLocation.Notification,
-                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4837, "Manage Extension")), this._commandService)))]
+                location: 15 ,
+                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4868, "Manage Extension")), this._commandService)))]
             };
             options = notificationOptions;
         }