@codingame/monaco-vscode-api 1.82.6 → 1.83.0-next.0

package/vscode/src/vs/workbench/contrib/output/browser/outputServices.js

@@ -5,7 +5,7 @@ import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_LOG_OUTPUT, OUTPUT_SCHEME, OUTPUT_VIEW_ID, Extensions, LOG_MIME, OUTPUT_MIME, LOG_SCHEME, IOutputService } from '../../../services/output/common/output.js';
+import { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_LOG_OUTPUT, OUTPUT_SCHEME, OUTPUT_VIEW_ID, Extensions, LOG_MIME, OUTPUT_MIME } from '../../../services/output/common/output.js';
 import { OutputLinkProvider } from './outputLinkProvider.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
@@ -163,40 +163,4 @@ OutputService = ( __decorate([
     ( __param(5, IViewsService)),
     ( __param(6, IContextKeyService))
 ], OutputService));
-let LogContentProvider = class LogContentProvider {
-    constructor(outputService, outputChannelModelService, languageService) {
-        this.outputService = outputService;
-        this.outputChannelModelService = outputChannelModelService;
-        this.languageService = languageService;
-        this.channelModels = ( new Map());
-    }
-    provideTextContent(resource) {
-        if (resource.scheme === LOG_SCHEME) {
-            const channelModel = this.getChannelModel(resource);
-            if (channelModel) {
-                return channelModel.loadModel();
-            }
-        }
-        return null;
-    }
-    getChannelModel(resource) {
-        const channelId = resource.path;
-        let channelModel = this.channelModels.get(channelId);
-        if (!channelModel) {
-            const channelDisposables = [];
-            const outputChannelDescriptor = this.outputService.getChannelDescriptors().filter(({ id }) => id === channelId)[0];
-            if (outputChannelDescriptor && outputChannelDescriptor.file) {
-                channelModel = this.outputChannelModelService.createOutputChannelModel(channelId, resource, outputChannelDescriptor.languageId ? this.languageService.createById(outputChannelDescriptor.languageId) : this.languageService.createByMimeType(outputChannelDescriptor.log ? LOG_MIME : OUTPUT_MIME), outputChannelDescriptor.file);
-                channelModel.onDispose(() => dispose(channelDisposables), channelDisposables);
-                this.channelModels.set(channelId, channelModel);
-            }
-        }
-        return channelModel;
-    }
-};
-LogContentProvider = ( __decorate([
-    ( __param(0, IOutputService)),
-    ( __param(1, IOutputChannelModelService)),
-    ( __param(2, ILanguageService))
-], LogContentProvider));
-export { LogContentProvider, OutputService };
+export { OutputService };

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js

@@ -64,4 +64,17 @@ async function getExperimentalExtensionToggleData(workbenchAssignmentService, en
     }
     return undefined;
 }
-export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, getExperimentalExtensionToggleData };
+function compareTwoNullableNumbers(a, b) {
+    const aOrMax = a ?? Number.MAX_SAFE_INTEGER;
+    const bOrMax = b ?? Number.MAX_SAFE_INTEGER;
+    if (aOrMax < bOrMax) {
+        return -1;
+    }
+    else if (aOrMax > bOrMax) {
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, compareTwoNullableNumbers, getExperimentalExtensionToggleData };

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -27,11 +27,12 @@ import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/pr
 import { IChatService } from '../../chat/common/chatService.js';
 import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js';
 import { RelatedInformationType, IAiRelatedInformationService } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var CommandsQuickAccessProvider_1;
 let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
     static { CommandsQuickAccessProvider_1 = this; }
-    static { this.AI_RELATED_INFORMATION_MAX_PICKS = 3; }
+    static { this.AI_RELATED_INFORMATION_MAX_PICKS = 5; }
     static { this.AI_RELATED_INFORMATION_THRESHOLD = 0.8; }
     static { this.AI_RELATED_INFORMATION_DEBOUNCE = 200; }
     get activeTextEditorControl() { return this.editorService.activeTextEditorControl; }
@@ -122,12 +123,6 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         catch (e) {
             return [];
         }
-        if (additionalPicks.length) {
-            additionalPicks.unshift({
-                type: 'separator',
-                label: ( localize('similarCommands', "similar commands"))
-            });
-        }
         if (picksSoFar.length || additionalPicks.length) {
             additionalPicks.push({
                 type: 'separator'
@@ -137,7 +132,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         if (info) {
             additionalPicks.push({
                 label: ( localize('askXInChat', "Ask {0}: {1}", info.displayName, filter)),
-                commandId: ASK_QUICK_QUESTION_ACTION_ID,
+                commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
         }

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -172,7 +172,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this.diffEditor.setModel(diffEditorModel);
         this.dropdown?.setSelection(labeledChange.label);
         const position = ( new Position(getModifiedEndLineNumber(change), 1));
-        const lineHeight = this.editor.getOption(65 );
+        const lineHeight = this.editor.getOption(66 );
         const editorHeight = this.editor.getLayoutInfo().height;
         const editorHeightInLines = Math.floor(editorHeight / lineHeight);
         const height = Math.min(getChangeHeight(change) +  8, Math.floor(editorHeightInLines / 3));
@@ -488,7 +488,7 @@ class GotoPreviousChangeAction extends EditorAction {
             return;
         }
         const lineNumber = outerEditor.getPosition().lineNumber;
-        const model = controller.modelRegistry.getModel(outerEditor.getModel());
+        const model = controller.modelRegistry.getModel(outerEditor.getModel(), outerEditor);
         if (!model || model.changes.length === 0) {
             return;
         }
@@ -522,7 +522,7 @@ class GotoNextChangeAction extends EditorAction {
             return;
         }
         const lineNumber = outerEditor.getPosition().lineNumber;
-        const model = controller.modelRegistry.getModel(outerEditor.getModel());
+        const model = controller.modelRegistry.getModel(outerEditor.getModel(), outerEditor);
         if (!model || model.changes.length === 0) {
             return;
         }
@@ -605,8 +605,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
     }
     onDidChangeGutterAction() {
         const gutterAction = this.configurationService.getValue('scm.diffDecorationsGutterAction');
-        this.gutterActionDisposables.dispose();
-        this.gutterActionDisposables = ( new DisposableStore());
+        this.gutterActionDisposables.clear();
         if (gutterAction === 'diff') {
             this.gutterActionDisposables.add(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
             this.gutterActionDisposables.add(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
@@ -696,7 +695,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!editorModel) {
             return false;
         }
-        const model = this.modelRegistry.getModel(editorModel);
+        const model = this.modelRegistry.getModel(editorModel, this.editor);
         if (!model) {
             return false;
         }
@@ -708,10 +707,9 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.isDirtyDiffVisible.set(true);
         const disposables = ( new DisposableStore());
         disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-        ( Event.chain(model.onDidChange)
-            .filter(e => e.diff.length > 0)
-            .map(e => e.diff))
-            .event(this.onDidModelChange, this, disposables);
+        const onDidModelChange = Event.chain(model.onDidChange, $ => ( $.filter(e => e.diff.length > 0)
+            .map(e => e.diff)));
+        onDidModelChange(this.onDidModelChange, this, disposables);
         disposables.add(this.widget);
         disposables.add(toDisposable(() => {
             this.model = null;
@@ -780,7 +778,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!editorModel) {
             return;
         }
-        const model = this.modelRegistry.getModel(editorModel);
+        const model = this.modelRegistry.getModel(editorModel, this.editor);
         if (!model) {
             return;
         }
@@ -802,7 +800,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!this.editor.hasModel()) {
             return [];
         }
-        const model = this.modelRegistry.getModel(this.editor.getModel());
+        const model = this.modelRegistry.getModel(this.editor.getModel(), this.editor);
         if (!model) {
             return [];
         }

package/vscode/src/vs/workbench/contrib/snippets/browser/tabCompletion.js

@@ -27,7 +27,7 @@ let TabCompletionController = class TabCompletionController {
         this._activeSnippets = [];
         this._hasSnippets = TabCompletionController_1.ContextKey.bindTo(contextKeyService);
         this._configListener = this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(121 )) {
+            if (e.hasChanged(122 )) {
                 this._update();
             }
         });
@@ -38,7 +38,7 @@ let TabCompletionController = class TabCompletionController {
         this._selectionListener?.dispose();
     }
     _update() {
-        const enabled = this._editor.getOption(121 ) === 'onlySnippets';
+        const enabled = this._editor.getOption(122 ) === 'onlySnippets';
         if (this._enabled !== enabled) {
             this._enabled = enabled;
             if (!this._enabled) {

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts

@@ -8,7 +8,7 @@ import { SerializeAddon } from '../../../../../../../../external/xterm-addon-ser
 import { ImageAddon } from '../../../../../../../../external/xterm-addon-image/typings/xterm-addon-image.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalConfigHelper } from '../terminalConfigHelper.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IShellIntegration, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalFont } from '../../common/terminal.js';
 import { IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal, IMarkTracker, ISuggestController, IXtermColorProvider, IXtermAttachToElementOptions } from '../terminal.js';
@@ -25,7 +25,7 @@ import { IClipboardService } from '../../../../../platform/clipboard/common/clip
  * Wraps the xterm object with additional functionality. Interaction with the backing process is out
  * of the scope of this class.
  */
-declare class XtermTerminal extends DisposableStore implements IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal {
+declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal {
     private readonly _configHelper;
     private readonly _backgroundColorProvider;
     private readonly _capabilities;

package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js

@@ -16,22 +16,6 @@ var TerminalContextKeys;
             "Whether any terminal is focused, including detached terminals used in other UI."
         ))
     ));
-    TerminalContextKeys.accessibleBufferFocus = ( new RawContextKey(
-        "terminalAccessibleBufferFocus" ,
-        false,
-        ( localize(
-            'terminalAccessibleBufferFocusContextKey',
-            "Whether the terminal accessible buffer is focused."
-        ))
-    ));
-    TerminalContextKeys.accessibleBufferOnLastLine = ( new RawContextKey(
-        "terminalAccessibleBufferOnLastLine" ,
-        false,
-        ( localize(
-            'terminalAccessibleBufferOnLastLineContextKey',
-            "Whether the accessible buffer focus is on the last line."
-        ))
-    ));
     TerminalContextKeys.editorFocus = ( new RawContextKey(
         "terminalEditorFocus" ,
         false,

package/vscode/src/vs/workbench/contrib/testing/common/observableValue.js

@@ -12,7 +12,8 @@ class MutableObservableValue extends Disposable {
     }
     static stored(stored, defaultValue) {
         const o = ( new MutableObservableValue(stored.get(defaultValue)));
-        o.onDidChange(value => stored.store(value));
+        o._register(stored);
+        o._register(o.onDidChange(value => stored.store(value)));
         return o;
     }
     constructor(_value) {

package/vscode/src/vs/workbench/contrib/testing/common/testResult.js

@@ -2,6 +2,7 @@ import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { language } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { removeAnsiEscapeCodes } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
@@ -102,7 +103,7 @@ const itemToNode = (controllerId, item, parent) => ({
     ownComputedState: 0 ,
     computedState: 0 ,
 });
-class LiveTestResult {
+class LiveTestResult extends Disposable {
     get completedAt() {
         return this._completedAt;
     }
@@ -110,13 +111,14 @@ class LiveTestResult {
         return ( this.testById.values());
     }
     constructor(id, persist, request) {
+        super();
         this.id = id;
         this.persist = persist;
         this.request = request;
-        this.completeEmitter = ( new Emitter());
-        this.newTaskEmitter = ( new Emitter());
-        this.endTaskEmitter = ( new Emitter());
-        this.changeEmitter = ( new Emitter());
+        this.completeEmitter = this._register(( new Emitter()));
+        this.newTaskEmitter = this._register(( new Emitter()));
+        this.endTaskEmitter = this._register(( new Emitter()));
+        this.changeEmitter = this._register(( new Emitter()));
         this.testById = ( new Map());
         this.testMarkerCounter = 0;
         this.startedAt = Date.now();
@@ -191,7 +193,7 @@ class LiveTestResult {
         }
     }
     addTask(task) {
-        this.tasks.push({ ...task, coverage: ( new MutableObservableValue(undefined)), otherMessages: [], output: ( new TaskRawOutput()) });
+        this.tasks.push({ ...task, coverage: this._register(( new MutableObservableValue(undefined))), otherMessages: [], output: ( new TaskRawOutput()) });
         for (const test of this.tests) {
             test.tasks.push({ duration: undefined, messages: [], state: 0  });
         }

package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js

@@ -156,14 +156,12 @@ const apiMenus = [
     {
         key: 'terminal/context',
         id: MenuId.TerminalInstanceContext,
-        description: ( localize('menus.terminalContext', "The terminal context menu")),
-        proposed: 'terminalContextMenu'
+        description: ( localize('menus.terminalContext', "The terminal context menu"))
     },
     {
         key: 'terminal/title/context',
         id: MenuId.TerminalTabContext,
-        description: ( localize('menus.terminalTabContext', "The terminal tabs context menu")),
-        proposed: 'terminalContextMenu'
+        description: ( localize('menus.terminalTabContext', "The terminal tabs context menu"))
     },
     {
         key: 'view/title',

package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js

@@ -43,10 +43,8 @@ function addAccountUsage(storageService, providerId, accountName, extensionId, e
     }
     storageService.store(accountKey, JSON.stringify(usages), -1 , 1 );
 }
-async function getCurrentAuthenticationSessionInfo(
-credentialsService, secretStorageService, productService) {
-    const authenticationSessionValue = (await secretStorageService.get(`${productService.urlProtocol}.loginAccount`))
-        ?? (await credentialsService.getPassword(`${productService.urlProtocol}.login`, 'account'));
+async function getCurrentAuthenticationSessionInfo(secretStorageService, productService) {
+    const authenticationSessionValue = await secretStorageService.get(`${productService.urlProtocol}.loginAccount`);
     if (authenticationSessionValue) {
         try {
             const authenticationSessionInfo = JSON.parse(authenticationSessionValue);

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -196,6 +196,7 @@ let DecorationsService = class DecorationsService {
     dispose() {
         this._onDidChangeDecorations.dispose();
         this._onDidChangeDecorationsDelayed.dispose();
+        this._data.clear();
     }
     registerDecorationsProvider(provider) {
         const rm = this._provider.unshift(provider);
@@ -276,13 +277,14 @@ let DecorationsService = class DecorationsService {
             pendingRequest.source.cancel();
             map.delete(provider);
         }
-        const source = ( new CancellationTokenSource());
-        const dataOrThenable = provider.provideDecorations(uri, source.token);
+        const cts = ( new CancellationTokenSource());
+        const dataOrThenable = provider.provideDecorations(uri, cts.token);
         if (!isThenable(dataOrThenable)) {
+            cts.dispose();
             return this._keepItem(map, provider, uri, dataOrThenable);
         }
         else {
-            const request = ( new DecorationDataRequest(source, Promise.resolve(dataOrThenable).then(data => {
+            const request = ( new DecorationDataRequest(cts, Promise.resolve(dataOrThenable).then(data => {
                 if (map.get(provider) === request) {
                     this._keepItem(map, provider, uri, data);
                 }
@@ -290,6 +292,8 @@ let DecorationsService = class DecorationsService {
                 if (!isCancellationError(err) && map.get(provider) === request) {
                     map.delete(provider);
                 }
+            }).finally(() => {
+                cts.dispose();
             })));
             map.set(provider, request);
             return null;

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts

@@ -69,9 +69,6 @@ interface EditorGroupLayout {
      */
     groups: GroupLayoutArgument[];
 }
-interface IAddGroupOptions {
-    activate?: boolean;
-}
 declare const enum MergeGroupMode {
     COPY_EDITORS = 0,
     MOVE_EDITORS = 1
@@ -297,9 +294,8 @@ interface IEditorGroupsService {
      *
      * @param location the group from which to split to add a new group
      * @param direction the direction of where to split to
-     * @param options configure the newly group with options
      */
-    addGroup(location: IEditorGroup | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroup;
+    addGroup(location: IEditorGroup | GroupIdentifier, direction: GroupDirection): IEditorGroup;
     /**
      * Remove a group from the editor area.
      */
@@ -609,4 +605,4 @@ interface IEditorGroup {
     focus(): void;
 }
 
-export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IAddGroupOptions, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorGroup, IEditorGroupsService, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorGroup, IEditorGroupsService, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -8,18 +8,20 @@ import { WebWorkerExtensionHost } from './webWorkerExtensionHost.js';
 import { checkEnabledAndProposedAPI } from '../common/abstractExtensionService.js';
 import { extensionRunningPreferenceToString, extensionHostKindToString } from '../common/extensionHostKind.js';
 import { filterExtensionDescriptions } from '../common/extensionRunningLocationTracker.js';
+import { ExtensionHostExtensions } from '../common/extensions.js';
 import { RemoteExtensionHost } from '../common/remoteExtensionHost.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 var BrowserExtensionHostKindPicker_1;
 let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
-    constructor(_extensionsProposedApi, _scanWebExtensions, _getExtensions, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService) {
+    constructor(_extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
         this._extensionsProposedApi = _extensionsProposedApi;
         this._scanWebExtensions = _scanWebExtensions;
-        this._getExtensions = _getExtensions;
+        this._getExtensionRegistrySnapshotWhenReady = _getExtensionRegistrySnapshotWhenReady;
         this._instantiationService = _instantiationService;
         this._remoteAgentService = _remoteAgentService;
         this._remoteAuthorityResolverService = _remoteAuthorityResolverService;
         this._extensionEnablementService = _extensionEnablementService;
+        this._logService = _logService;
     }
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
         switch (runningLocation.kind) {
@@ -43,21 +45,17 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
         return {
             getInitData: async () => {
                 if (isInitialStart) {
-                    const localExtensions = checkEnabledAndProposedAPI(this._extensionEnablementService, this._extensionsProposedApi, await this._scanWebExtensions(),  true);
+                    const localExtensions = checkEnabledAndProposedAPI(this._logService, this._extensionEnablementService, this._extensionsProposedApi, await this._scanWebExtensions(),  true);
                     const runningLocation = runningLocations.computeRunningLocation(localExtensions, [], false);
                     const myExtensions = filterExtensionDescriptions(localExtensions, runningLocation, extRunningLocation => desiredRunningLocation.equals(extRunningLocation));
-                    return {
-                        allExtensions: localExtensions,
-                        myExtensions: ( myExtensions.map(extension => extension.identifier))
-                    };
+                    const extensions = ( new ExtensionHostExtensions(0, localExtensions, ( myExtensions.map(extension => extension.identifier))));
+                    return { extensions };
                 }
                 else {
-                    const allExtensions = await this._getExtensions();
-                    const myExtensions = runningLocations.filterByRunningLocation(allExtensions, desiredRunningLocation);
-                    return {
-                        allExtensions: allExtensions,
-                        myExtensions: ( myExtensions.map(extension => extension.identifier))
-                    };
+                    const snapshot = await this._getExtensionRegistrySnapshotWhenReady();
+                    const myExtensions = runningLocations.filterByRunningLocation(snapshot.extensions, desiredRunningLocation);
+                    const extensions = ( new ExtensionHostExtensions(snapshot.versionId, snapshot.extensions, ( myExtensions.map(extension => extension.identifier))));
+                    return { extensions };
                 }
             }
         };
@@ -66,23 +64,22 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
         return {
             remoteAuthority: remoteAuthority,
             getInitData: async () => {
-                const allExtensions = await this._getExtensions();
+                const snapshot = await this._getExtensionRegistrySnapshotWhenReady();
                 const remoteEnv = await this._remoteAgentService.getEnvironment();
                 if (!remoteEnv) {
                     throw new Error('Cannot provide init data for remote extension host!');
                 }
-                const myExtensions = runningLocations.filterByExtensionHostKind(allExtensions, 3 );
-                const initData = {
+                const myExtensions = runningLocations.filterByExtensionHostKind(snapshot.extensions, 3 );
+                const extensions = ( new ExtensionHostExtensions(snapshot.versionId, snapshot.extensions, ( myExtensions.map(extension => extension.identifier))));
+                return {
                     connectionData: this._remoteAuthorityResolverService.getConnectionData(remoteAuthority),
                     pid: remoteEnv.pid,
                     appRoot: remoteEnv.appRoot,
                     extensionHostLogsPath: remoteEnv.extensionHostLogsPath,
                     globalStorageHome: remoteEnv.globalStorageHome,
                     workspaceStorageHome: remoteEnv.workspaceStorageHome,
-                    allExtensions: allExtensions,
-                    myExtensions: ( myExtensions.map(extension => extension.identifier)),
+                    extensions,
                 };
-                return initData;
             }
         };
     }
@@ -91,7 +88,8 @@ BrowserExtensionHostFactory = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, IRemoteAgentService)),
     ( __param(5, IRemoteAuthorityResolverService)),
-    ( __param(6, IWorkbenchExtensionEnablementService))
+    ( __param(6, IWorkbenchExtensionEnablementService)),
+    ( __param(7, ILogService))
 ], BrowserExtensionHostFactory));
 let BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = class BrowserExtensionHostKindPicker {
     constructor(_logService) {

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { parentOriginHash } from 'monaco-editor/esm/vs/base/browser/iframe.js';
 import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { canceled, onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
@@ -19,10 +20,8 @@ import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/commo
 import { isLoggingOnly } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { parentOriginHash } from '../../../browser/iframe.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 import { isMessageOfType, createMessageOfType, UIKind } from '../common/extensionHostProtocol.js';
-import { ExtensionHostExtensions } from '../common/extensions.js';
 let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
     constructor(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {
         super();
@@ -40,7 +39,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         this._layoutService = _layoutService;
         this._storageService = _storageService;
         this.remoteAuthority = null;
-        this.extensions = ( (new ExtensionHostExtensions()));
+        this.extensions = null;
         this._onDidExit = this._register(( (new Emitter())));
         this.onExit = this._onDidExit.event;
         this._isTerminating = false;
@@ -91,7 +90,6 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         return this._protocolPromise;
     }
     async _startInsideIframe() {
-        const initDataPromise = this._initDataProvider.getInitData();
         const webWorkerExtensionHostIframeSrc = await this._getWebWorkerExtensionHostIframeSrc();
         const emitter = this._register(( (new Emitter())));
         const iframe = document.createElement('iframe');
@@ -170,14 +168,14 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 port.postMessage(data, [data]);
             }
         };
-        return this._performHandshake(protocol, initDataPromise);
+        return this._performHandshake(protocol);
     }
-    async _performHandshake(protocol, initDataPromise) {
+    async _performHandshake(protocol) {
         await Event.toPromise(Event.filter(protocol.onMessage, msg => isMessageOfType(msg, 1 )));
         if (this._isTerminating) {
             throw canceled();
         }
-        protocol.send(VSBuffer.fromString(JSON.stringify(await this._createExtHostInitData(initDataPromise))));
+        protocol.send(VSBuffer.fromString(JSON.stringify(await this._createExtHostInitData())));
         if (this._isTerminating) {
             throw canceled();
         }
@@ -201,10 +199,10 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
     enableInspectPort() {
         return Promise.resolve(false);
     }
-    async _createExtHostInitData(initDataPromise) {
-        const initData = await initDataPromise;
+    async _createExtHostInitData() {
+        const initData = await this._initDataProvider.getInitData();
+        this.extensions = initData.extensions;
         const workspace = this._contextService.getWorkspace();
-        const deltaExtensions = this.extensions.set(initData.allExtensions, initData.myExtensions);
         const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
         let nlsUrlWithDetails = undefined;
         if (nlsBaseUrl && this._productService.commit && !platform.Language.isDefaultVariant()) {
@@ -239,9 +237,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 includeStack: false,
                 logNative: this._environmentService.debugRenderer
             },
-            allExtensions: deltaExtensions.toAdd,
-            activationEvents: deltaExtensions.addActivationEvents,
-            myExtensions: deltaExtensions.myToAdd,
+            extensions: this.extensions.toSnapshot(),
             nlsBaseUrl: nlsUrlWithDetails,
             telemetryInfo: {
                 sessionId: this._telemetryService.sessionId,

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -14,6 +14,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../extensionManagement/common/extensionManagement.js';
+import { ExtensionDescriptionRegistrySnapshot } from './extensionDescriptionRegistry.js';
 import { IExtensionHostKindPicker, ExtensionHostKind } from './extensionHostKind.js';
 import { IExtensionHostManager } from './extensionHostManager.js';
 import { IExtensionManifestPropertiesService } from './extensionManifestPropertiesService.js';
@@ -110,7 +111,7 @@ declare abstract class AbstractExtensionService extends Disposable implements IE
     activationEventIsDone(activationEvent: string): boolean;
     whenInstalledExtensionsRegistered(): Promise<boolean>;
     get extensions(): IExtensionDescription[];
-    protected _getExtensions(): Promise<IExtensionDescription[]>;
+    protected _getExtensionRegistrySnapshotWhenReady(): Promise<ExtensionDescriptionRegistrySnapshot>;
     getExtension(id: string): Promise<IExtensionDescription | undefined>;
     readExtensionPointContributions<T extends IExtensionContributions[keyof IExtensionContributions]>(extPoint: IExtensionPoint<T>): Promise<ExtensionPointContribution<T>[]>;
     getExtensionsStatus(): {