@codingame/monaco-vscode-extensions-service-override 14.0.6 → 15.0.1

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

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { ICellRange } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

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

@@ -5,9 +5,9 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-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 { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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

@@ -1,5 +1,5 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";

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

@@ -6,11 +6,11 @@ import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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

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

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

@@ -69,15 +69,15 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2352, "Show Output")),
+            name: ( localize(2374, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2353, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2375, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2354, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2376, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {
-            this._outputStatusItem.value = this._statusbarService.addEntry(statusProperties, 'status.view.showQuietly', StatusbarAlignment.RIGHT, { id: 'status.notifications', alignment: StatusbarAlignment.LEFT });
+            this._outputStatusItem.value = this._statusbarService.addEntry(statusProperties, 'status.view.showQuietly', StatusbarAlignment.RIGHT, { location: { id: 'status.notifications', priority: Number.NEGATIVE_INFINITY }, alignment: StatusbarAlignment.LEFT });
         }
         else {
             this._outputStatusItem.value.update(statusProperties);

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

@@ -4,18 +4,11 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 
-class ManageExtensionAction extends Action {
-    constructor(extensionId, label, commandService) {
-        super(extensionId, label, undefined, true, () => {
-            return commandService.executeCommand('_extensions.manage', extensionId);
-        });
-    }
-}
 let MainThreadProgress = class MainThreadProgress {
     constructor(extHostContext, progressService, _commandService) {
         this._commandService = _commandService;
@@ -33,7 +26,11 @@ let MainThreadProgress = class MainThreadProgress {
             const notificationOptions = {
                 ...options,
                 location: ProgressLocation.Notification,
-                secondaryActions: [( new ManageExtensionAction(extensionId, ( localize(2355, "Manage Extension")), this._commandService))]
+                secondaryActions: [toAction({
+                        id: extensionId,
+                        label: ( localize(2377, "Manage Extension")),
+                        run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
+                    })]
             };
             options = notificationOptions;
         }

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

@@ -8,9 +8,9 @@ import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 export declare class MainThreadSCM implements MainThreadSCMShape {
     private readonly scmService;
     private readonly scmViewService;

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

@@ -3,17 +3,12 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Barrier } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { isUriComponents, URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/api';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { Disposable, DisposableStore, dispose, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
@@ -21,11 +16,14 @@ import { ResourceTree } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-f
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
 import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/api';
 
 function getIconFromIconDto(iconDto) {
     if (iconDto === undefined) {
@@ -79,6 +77,7 @@ class MainThreadSCMResourceGroup {
         return this._resourceTree;
     }
     get hideWhenEmpty() { return !!this.features.hideWhenEmpty; }
+    get contextValue() { return this.features.contextValue; }
     constructor(sourceControlHandle, handle, provider, features, label, id, multiDiffEditorEnableViewChanges, _uriIdentService) {
         this.sourceControlHandle = sourceControlHandle;
         this.handle = handle;

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

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

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

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

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

@@ -224,14 +224,12 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     $registerCompletionProvider(id, extensionIdentifier, ...triggerCharacters) {
         this._completionProviders.set(id, this._terminalCompletionService.registerTerminalCompletionProvider(extensionIdentifier, id, {
             id,
-            provideCompletions: async (commandLine, cursorPosition, token) => {
-                const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition }, token);
-                if (Array.isArray(completions)) {
-                    return ( completions.map(c => ({ ...c, provider: id })));
-                }
-                else {
-                    return { items: completions?.items.map(c => ({ ...c, provider: id })), resourceRequestConfig: completions?.resourceRequestConfig };
-                }
+            provideCompletions: async (commandLine, cursorPosition, allowFallbackCompletions, token) => {
+                const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition, allowFallbackCompletions }, token);
+                return {
+                    items: completions?.items.map(c => ({ ...c, provider: id })),
+                    resourceRequestConfig: completions?.resourceRequestConfig
+                };
             }
         }, ...triggerCharacters));
     }
@@ -319,7 +317,8 @@ let MainThreadTerminalService = class MainThreadTerminalService {
             args: terminalInstance.shellLaunchConfig.args,
             cwd: terminalInstance.shellLaunchConfig.cwd,
             env: terminalInstance.shellLaunchConfig.env,
-            hideFromUser: terminalInstance.shellLaunchConfig.hideFromUser
+            hideFromUser: terminalInstance.shellLaunchConfig.hideFromUser,
+            tabActions: terminalInstance.shellLaunchConfig.tabActions
         };
         this._proxy.$acceptTerminalOpened(terminalInstance.instanceId, extHostTerminalId, terminalInstance.title, shellLaunchConfigDto);
     }

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

@@ -42,9 +42,12 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         }));
         const envChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.ShellEnvDetection, e => e.onDidChangeEnv));
         this._store.add(envChangeEvent.event(e => {
-            const keysArr = Array.from(( e.data.keys()));
-            const valuesArr = Array.from(( e.data.values()));
-            this._proxy.$shellEnvChange(e.instance.instanceId, keysArr, valuesArr);
+            if (e.data.value && typeof e.data.value === 'object') {
+                const envValue = e.data.value;
+                const keysArr = ( Object.keys(envValue));
+                const valuesArr = ( Object.values(envValue));
+                this._proxy.$shellEnvChange(e.instance.instanceId, keysArr, valuesArr, e.data.isTrusted);
+            }
         }));
         const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandExecuted));
         let currentCommand;
@@ -56,16 +59,16 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             const instanceId = e.instance.instanceId;
             this._proxy.$shellExecutionStart(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, this._convertCwdToUri(e.data.cwd));
             instanceDataListeners.get(instanceId)?.dispose();
-            instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join(''))));
+            instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => {
+                this._proxy.$shellExecutionData(instanceId, events.join(''));
+            }));
         }));
         const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandFinished));
         this._store.add(commandDetectionEndEvent.event(e => {
             currentCommand = undefined;
             const instanceId = e.instance.instanceId;
             instanceDataListeners.get(instanceId)?.dispose();
-            setTimeout(() => {
-                this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
-            });
+            this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
         }));
         this._store.add(this._terminalService.onDidDisposeInstance(e => this._proxy.$closeTerminal(e.instanceId)));
     }

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

@@ -2,12 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { transaction, observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { WellDefinedPrefixTree } from '@codingame/monaco-vscode-api/vscode/vs/base/common/prefixTree';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -21,6 +16,7 @@ import { ITestService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { TestRunProfileBitset, ITestItem, IFileCoverage, CoverageDetails, ITestMessage, TestsDiffOp } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testTypes';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { transaction, observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
 let MainThreadTesting = class MainThreadTesting extends Disposable {
     constructor(extHostContext, uriIdentityService, testService, testProfiles, resultService) {

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

@@ -200,7 +200,7 @@ class TreeViewDragAndDropController {
     async handleDrop(dataTransfer, targetTreeItem, token, operationUuid, sourceTreeId, sourceTreeItemHandles) {
         const request = this.dataTransfersCache.add(dataTransfer);
         try {
-            const dataTransferDto = await DataTransfer.from(dataTransfer);
+            const dataTransferDto = await DataTransfer.fromList(dataTransfer);
             if (token.isCancellationRequested) {
                 return;
             }

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

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

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

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

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

@@ -1,28 +1,26 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { MainThreadWebviews } from "./mainThreadWebviews.js";
-import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { WebviewInput } from "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { MainThreadWebviews } from "./mainThreadWebviews.js";
 export declare class MainThreadWebviewPanels extends Disposable implements extHostProtocol.MainThreadWebviewPanelsShape {
     private readonly _mainThreadWebviews;
     private readonly _configurationService;
     private readonly _editorGroupService;
     private readonly _editorService;
-    private readonly _telemetryService;
     private readonly _webviewWorkbenchService;
     private readonly webviewPanelViewType;
     private readonly _proxy;
     private readonly _webviewInputs;
     private readonly _revivers;
     private readonly webviewOriginStore;
-    constructor(context: IExtHostContext, _mainThreadWebviews: MainThreadWebviews, _configurationService: IConfigurationService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, extensionService: IExtensionService, storageService: IStorageService, _telemetryService: ITelemetryService, _webviewWorkbenchService: IWebviewWorkbenchService);
+    constructor(context: IExtHostContext, _mainThreadWebviews: MainThreadWebviews, _configurationService: IConfigurationService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, extensionService: IExtensionService, storageService: IStorageService, _webviewWorkbenchService: IWebviewWorkbenchService);
     get webviewInputs(): Iterable<WebviewInput>;
     addWebviewInput(handle: extHostProtocol.WebviewHandle, input: WebviewInput, options: {
         serializeBuffersForPostMessage: boolean;

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

@@ -7,19 +7,18 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { reviveWebviewExtension, reviveWebviewContentOptions } from './mainThreadWebviews.js';
-import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/diffEditorInput';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupsOrder, GroupLocation, 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 { ACTIVE_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { reviveWebviewExtension, reviveWebviewContentOptions } from './mainThreadWebviews.js';
 
 class WebviewInputStore {
     constructor() {
@@ -64,13 +63,12 @@ class WebviewViewTypeTransformer {
     }
 }
 let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
-    constructor(context, _mainThreadWebviews, _configurationService, _editorGroupService, _editorService, extensionService, storageService, _telemetryService, _webviewWorkbenchService) {
+    constructor(context, _mainThreadWebviews, _configurationService, _editorGroupService, _editorService, extensionService, storageService, _webviewWorkbenchService) {
         super();
         this._mainThreadWebviews = _mainThreadWebviews;
         this._configurationService = _configurationService;
         this._editorGroupService = _editorGroupService;
         this._editorService = _editorService;
-        this._telemetryService = _telemetryService;
         this._webviewWorkbenchService = _webviewWorkbenchService;
         this.webviewPanelViewType = ( new WebviewViewTypeTransformer('mainThreadWebview-'));
         this._webviewInputs = ( new WebviewInputStore());
@@ -121,11 +119,6 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
             extension
         }, this.webviewPanelViewType.fromExternal(viewType), initData.title, mainThreadShowOptions);
         this.addWebviewInput(handle, webview, { serializeBuffersForPostMessage: initData.serializeBuffersForPostMessage });
-        const payload = {
-            extensionId: extension.id.value,
-            viewType
-        };
-        this._telemetryService.publicLog2('webviews:createWebviewPanel', payload);
     }
     $disposeWebview(handle) {
         const webview = this.tryGetWebviewInput(handle);
@@ -264,8 +257,7 @@ MainThreadWebviewPanels = ( __decorate([
     ( __param(4, IEditorService)),
     ( __param(5, IExtensionService)),
     ( __param(6, IStorageService)),
-    ( __param(7, ITelemetryService)),
-    ( __param(8, IWebviewWorkbenchService))
+    ( __param(7, IWebviewWorkbenchService))
 ], MainThreadWebviewPanels));
 function reviveWebviewIcon(value) {
     if (!value) {

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

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

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

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

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

@@ -20,6 +20,8 @@ import { IWorkspaceEditingService } from "@codingame/monaco-vscode-api/vscode/vs
 import { ITextSearchComplete, MainThreadWorkspaceShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IEditSessionIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/editSessions.service";
 import { ICanonicalUriService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/canonicalUri.service";
+import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
+import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 export declare class MainThreadWorkspace implements MainThreadWorkspaceShape {
     private readonly _searchService;
     private readonly _contextService;
@@ -34,11 +36,12 @@ export declare class MainThreadWorkspace implements MainThreadWorkspaceShape {
     private readonly _environmentService;
     private readonly _workspaceTrustManagementService;
     private readonly _workspaceTrustRequestService;
+    private readonly _textFileService;
     private readonly _toDispose;
     private readonly _activeCancelTokens;
     private readonly _proxy;
     private readonly _queryBuilder;
-    constructor(extHostContext: IExtHostContext, _searchService: ISearchService, _contextService: IWorkspaceContextService, _editSessionIdentityService: IEditSessionIdentityService, _canonicalUriService: ICanonicalUriService, _editorService: IEditorService, _workspaceEditingService: IWorkspaceEditingService, _notificationService: INotificationService, _requestService: IRequestService, _instantiationService: IInstantiationService, _labelService: ILabelService, _environmentService: IEnvironmentService, fileService: IFileService, _workspaceTrustManagementService: IWorkspaceTrustManagementService, _workspaceTrustRequestService: IWorkspaceTrustRequestService);
+    constructor(extHostContext: IExtHostContext, _searchService: ISearchService, _contextService: IWorkspaceContextService, _editSessionIdentityService: IEditSessionIdentityService, _canonicalUriService: ICanonicalUriService, _editorService: IEditorService, _workspaceEditingService: IWorkspaceEditingService, _notificationService: INotificationService, _requestService: IRequestService, _instantiationService: IInstantiationService, _labelService: ILabelService, _environmentService: IEnvironmentService, fileService: IFileService, _workspaceTrustManagementService: IWorkspaceTrustManagementService, _workspaceTrustRequestService: IWorkspaceTrustRequestService, _textFileService: ITextFileService);
     dispose(): void;
     $updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, foldersToAdd: {
         uri: UriComponents;
@@ -68,4 +71,10 @@ export declare class MainThreadWorkspace implements MainThreadWorkspaceShape {
     private registeredCanonicalUriProviders;
     $registerCanonicalUriProvider(handle: number, scheme: string): void;
     $unregisterCanonicalUriProvider(handle: number): void;
+    $decode(content: VSBuffer, resource: UriComponents | undefined, options?: {
+        encoding: string;
+    }): Promise<string>;
+    $encode(content: string, resource: UriComponents | undefined, options?: {
+        encoding: string;
+    }): Promise<VSBuffer>;
 }

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

@@ -26,9 +26,12 @@ import { SideBySideEditor, SaveReason, EditorResourceAccessor } from '@codingame
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { ICanonicalUriService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/canonicalUri.service';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+import { bufferToStream, readableToBuffer, VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { consumeStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 
 let MainThreadWorkspace = class MainThreadWorkspace {
-    constructor(extHostContext, _searchService, _contextService, _editSessionIdentityService, _canonicalUriService, _editorService, _workspaceEditingService, _notificationService, _requestService, _instantiationService, _labelService, _environmentService, fileService, _workspaceTrustManagementService, _workspaceTrustRequestService) {
+    constructor(extHostContext, _searchService, _contextService, _editSessionIdentityService, _canonicalUriService, _editorService, _workspaceEditingService, _notificationService, _requestService, _instantiationService, _labelService, _environmentService, fileService, _workspaceTrustManagementService, _workspaceTrustRequestService, _textFileService) {
         this._searchService = _searchService;
         this._contextService = _contextService;
         this._editSessionIdentityService = _editSessionIdentityService;
@@ -42,6 +45,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         this._environmentService = _environmentService;
         this._workspaceTrustManagementService = _workspaceTrustManagementService;
         this._workspaceTrustRequestService = _workspaceTrustRequestService;
+        this._textFileService = _textFileService;
         this._toDispose = ( new DisposableStore());
         this._activeCancelTokens = Object.create(null);
         this._queryBuilder = this._instantiationService.createInstance(QueryBuilder);
@@ -77,11 +81,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2363, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2385, "Extension '{0}' added 1 folder to the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2364,
+                    2386,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -90,11 +94,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2365, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2387, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2366,
+                    2388,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -102,7 +106,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2367, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2389, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }
@@ -238,6 +242,14 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         disposable?.dispose();
         this.registeredCanonicalUriProviders.delete(handle);
     }
+    async $decode(content, resource, options) {
+        const stream = await this._textFileService.getDecodedStream(URI.revive(resource) ?? undefined, bufferToStream(content), { acceptTextOnly: true, encoding: options?.encoding });
+        return consumeStream(stream, chunks => chunks.join());
+    }
+    async $encode(content, resource, options) {
+        const res = await this._textFileService.getEncodedReadable(URI.revive(resource) ?? undefined, content, { encoding: options?.encoding });
+        return res instanceof VSBuffer ? res : readableToBuffer(res);
+    }
 };
 MainThreadWorkspace = __decorate([
     extHostNamedCustomer(MainContext.MainThreadWorkspace),
@@ -254,7 +266,8 @@ MainThreadWorkspace = __decorate([
     ( __param(11, IEnvironmentService)),
     ( __param(12, IFileService)),
     ( __param(13, IWorkspaceTrustManagementService)),
-    ( __param(14, IWorkspaceTrustRequestService))
+    ( __param(14, IWorkspaceTrustRequestService)),
+    ( __param(15, ITextFileService))
 ], MainThreadWorkspace);
 
 export { MainThreadWorkspace };