@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -1,20 +1,20 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { ITestResultService } from './testResultService.js';
 import { TestingContextKeys } from './testingContextKeys.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 const ITestCoverageService = ( createDecorator('testCoverageService'));
 let TestCoverageService = class TestCoverageService extends Disposable {
-    constructor(contextKeyService, resultService, viewsService, notificationService) {
+    constructor(contextKeyService, resultService, viewsService) {
         super();
         this.viewsService = viewsService;
-        this.notificationService = notificationService;
         this.lastOpenCts = this._register(( new MutableDisposable()));
         this.selected = observableValue('testCoverage', undefined);
         this._isOpenKey = TestingContextKeys.isTestCoverageOpen.bindTo(contextKeyService);
@@ -39,26 +39,12 @@ let TestCoverageService = class TestCoverageService extends Disposable {
     async openCoverage(task, focus = true) {
         this.lastOpenCts.value?.cancel();
         const cts = this.lastOpenCts.value = ( new CancellationTokenSource());
-        const getCoverage = task.coverage.get();
-        if (!getCoverage) {
-            return;
-        }
-        try {
-            const coverage = await getCoverage(cts.token);
-            this.selected.set(coverage, undefined);
-            this._isOpenKey.set(true);
-        }
-        catch (e) {
-            if (!cts.token.isCancellationRequested) {
-                this.notificationService.error(( localizeWithPath(
-                    'vs/workbench/contrib/testing/common/testCoverageService',
-                    'testCoverageError',
-                    'Failed to load test coverage: {0}',
-                    String(e)
-                )));
-            }
+        const coverage = task.coverage.get();
+        if (!coverage) {
             return;
         }
+        this.selected.set(coverage, undefined);
+        this._isOpenKey.set(true);
         if (focus && !cts.token.isCancellationRequested) {
             this.viewsService.openView("workbench.view.testCoverage" , true);
         }
@@ -71,7 +57,6 @@ let TestCoverageService = class TestCoverageService extends Disposable {
 TestCoverageService = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, ITestResultService)),
-    ( __param(2, IViewsService)),
-    ( __param(3, INotificationService))
+    ( __param(2, IViewsService))
 ], TestCoverageService));
 export { ITestCoverageService, TestCoverageService };

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

@@ -3,14 +3,17 @@ import { VSBuffer } from '../../../../base/common/buffer.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { language } from '../../../../base/common/platform.js';
-import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { refreshComputedState } from './getComputedState.js';
 import { TestId } from './testId.js';
 import { makeEmptyCounts, terminalStatePriorities, maxPriority, statesInOrder } from './testingStates.js';
 import { TestResultItem, getMarkId } from './testTypes.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
 const emptyRawOutput = {
     buffers: [],
     length: 0,
@@ -195,7 +198,7 @@ class LiveTestResult extends Disposable {
         const { offset, length } = task.output.append(output, marker);
         const message = {
             location,
-            message: removeAnsiEscapeCodes(preview),
+            message: preview,
             offset,
             length,
             marker,

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

@@ -2,6 +2,15 @@ import { URI } from '../../../../base/common/uri.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { TestId } from './testId.js';
+const testResultStateToContextValues = {
+    [0 ]: 'unset',
+    [1 ]: 'queued',
+    [2 ]: 'running',
+    [3 ]: 'passed',
+    [4 ]: 'failed',
+    [5 ]: 'skipped',
+    [6 ]: 'errored',
+};
 const testRunProfileBitsetList = [
     2 ,
     4 ,
@@ -219,28 +228,20 @@ var TestResultItem;
         retired: true,
     });
 })(TestResultItem || (TestResultItem = {})));
-var ICoveredCount;
-( (function(ICoveredCount) {
-    ICoveredCount.empty = () => ({ covered: 0, total: 0 });
-    ICoveredCount.sum = (target, src) => {
-        target.covered += src.covered;
-        target.total += src.total;
-    };
-})(ICoveredCount || (ICoveredCount = {})));
 var IFileCoverage;
 ( (function(IFileCoverage) {
     IFileCoverage.serialize = (original) => ({
+        id: original.id,
         statement: original.statement,
         branch: original.branch,
         declaration: original.declaration,
-        details: original.details?.map(CoverageDetails.serialize),
         uri: original.uri.toJSON(),
     });
     IFileCoverage.deserialize = (uriIdentity, serialized) => ({
+        id: serialized.id,
         statement: serialized.statement,
         branch: serialized.branch,
         declaration: serialized.declaration,
-        details: serialized.details?.map(CoverageDetails.deserialize),
         uri: uriIdentity.asCanonicalUri(URI.revive(serialized.uri)),
     });
 })(IFileCoverage || (IFileCoverage = {})));
@@ -254,7 +255,6 @@ function deserializeThingWithLocation(serialized) {
     serialized.location = serialized.location ? (Position.isIPosition(serialized.location) ? Position.lift(serialized.location) : Range.lift(serialized.location)) : undefined;
     return serialized;
 }
-const KEEP_N_LAST_COVERAGE_REPORTS = 3;
 var CoverageDetails;
 ( (function(CoverageDetails) {
     CoverageDetails.serialize = (original) => original.type === 0  ? IDeclarationCoverage.serialize(original) : IStatementCoverage.serialize(original);
@@ -426,4 +426,4 @@ class AbstractIncrementalTestCollection {
         return {};
     }
 }
-export { AbstractIncrementalTestCollection, CoverageDetails, IBranchCoverage, ICoveredCount, IDeclarationCoverage, IFileCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestOutputMessage, ITestTaskState, InternalTestItem, KEEP_N_LAST_COVERAGE_REPORTS, TestResultItem, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testRunProfileBitsetList };
+export { AbstractIncrementalTestCollection, CoverageDetails, IBranchCoverage, IDeclarationCoverage, IFileCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestOutputMessage, ITestTaskState, InternalTestItem, TestResultItem, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testResultStateToContextValues, testRunProfileBitsetList };

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

@@ -184,5 +184,13 @@ var TestingContextKeys;
             'Value available in editor/content and testing/message/context when the result is outdated'
         ))
     }));
+    TestingContextKeys.testResultState = ( new RawContextKey('testResultState', undefined, {
+        type: 'string',
+        description: ( localizeWithPath(
+            'vs/workbench/contrib/testing/common/testingContextKeys',
+            'testing.testResultState',
+            'Value available testing/item/result indicating the state of the item.'
+        ))
+    }));
 })(TestingContextKeys || (TestingContextKeys = {})));
 export { TestingContextKeys };

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

@@ -1,4 +1,6 @@
+import '../../../../base/common/strings.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import '../../../../base/common/network.js';
 const TimelinePaneId = 'timeline';
 const TIMELINE_SERVICE_ID = 'timeline';
 const ITimelineService = ( createDecorator(TIMELINE_SERVICE_ID));

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -6,7 +6,7 @@ import { TreeMouseEventTarget } from '../../../../base/browser/ui/tree/tree.js';
 import { Color } from '../../../../base/common/color.js';
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
-import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { OverviewRulerLane } from '../../../../editor/common/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';

package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js

@@ -1,12 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { getWindowById } from '../../../../base/browser/dom.js';
 import { FastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, IWebviewService } from './webview.js';
 let OverlayWebview = class OverlayWebview extends Disposable {
+    get window() { return getWindowById(this._windowId, true).window; }
     constructor(initInfo, _layoutService, _webviewService, _baseContextKeyService) {
         super();
         this._layoutService = _layoutService;
@@ -20,6 +22,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this._initialScrollProgress = 0;
         this._state = undefined;
         this._owner = undefined;
+        this._windowId = undefined;
         this._scopedContextKeyService = this._register(( new MutableDisposable()));
         this._shouldShowFindWidgetOnRestore = false;
         this._isDisposed = false;
@@ -76,17 +79,25 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             node.style.overflow = 'hidden';
             this._container = ( new FastDomNode(node));
             this._container.setVisibility('hidden');
-            this._layoutService.mainContainer.appendChild(node);
+            this._layoutService.getContainer(this.window).appendChild(node);
         }
         return this._container.domNode;
     }
-    claim(owner, scopedContextKeyService) {
+    claim(owner, targetWindow, scopedContextKeyService) {
         if (this._isDisposed) {
             return;
         }
         const oldOwner = this._owner;
+        if (this._windowId !== targetWindow.vscodeWindowId) {
+            this.release(oldOwner);
+            this._webview.clear();
+            this._webviewEvents.clear();
+            this._container?.domNode.remove();
+            this._container = undefined;
+        }
         this._owner = owner;
-        this._show();
+        this._windowId = targetWindow.vscodeWindowId;
+        this._show(targetWindow);
         if (oldOwner !== owner) {
             const contextKeyService = (scopedContextKeyService || this._baseContextKeyService);
             this._scopedContextKeyService.clear();
@@ -120,6 +131,18 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         }
     }
     layoutWebviewOverElement(element, dimension, clippingContainer) {
+        if (!this._container || !this._container.domNode.parentElement) {
+            return;
+        }
+        const whenContainerStylesLoaded = this._layoutService.whenContainerStylesLoaded(this.window);
+        if (whenContainerStylesLoaded) {
+            whenContainerStylesLoaded.then(() => this.doLayoutWebviewOverElement(element, dimension, clippingContainer));
+        }
+        else {
+            this.doLayoutWebviewOverElement(element, dimension, clippingContainer);
+        }
+    }
+    doLayoutWebviewOverElement(element, dimension, clippingContainer) {
         if (!this._container || !this._container.domNode.parentElement) {
             return;
         }
@@ -136,7 +159,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this._container.domNode.style.clipPath = `polygon(${left}px ${top}px, ${right}px ${top}px, ${right}px ${bottom}px, ${left}px ${bottom}px)`;
         }
     }
-    _show() {
+    _show(targetWindow) {
         if (this._isDisposed) {
             throw new Error('OverlayWebview is disposed');
         }
@@ -161,7 +184,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
                 webview.initialScrollProgress = this._initialScrollProgress;
             }
             this._findWidgetEnabled?.set(!!this.options.enableFindWidget);
-            webview.mountTo(this.container);
+            webview.mountTo(this.container, targetWindow);
             this._webviewEvents.clear();
             this._webviewEvents.add(webview.onDidFocus(() => { this._onDidFocus.fire(); }));
             this._webviewEvents.add(webview.onDidBlur(() => { this._onDidBlur.fire(); }));
@@ -273,7 +296,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
     }
 };
 OverlayWebview = ( __decorate([
-    ( __param(1, ILayoutService)),
+    ( __param(1, IWorkbenchLayoutService)),
     ( __param(2, IWebviewService)),
     ( __param(3, IContextKeyService))
 ], OverlayWebview));

package/vscode/src/vs/workbench/contrib/webview/browser/themeing.js

@@ -1,12 +1,22 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { EDITOR_FONT_DEFAULTS } from '../../../../editor/common/config/editorOptions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { getColorRegistry } from '../../../../platform/theme/common/colorRegistry.js';
+import { getColorRegistry } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { ColorScheme } from '../../../../platform/theme/common/theme.js';
 import { IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.js';
-import { DEFAULT_FONT_FAMILY } from '../../../browser/style.js';
 let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable {
     constructor(_themeService, _configurationService) {
         super();

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { isFirefox } from '../../../../base/browser/browser.js';
-import { addDisposableListener, getActiveWindow, EventType } from '../../../../base/browser/dom.js';
+import { getWindowById, EventType, addDisposableListener } from '../../../../base/browser/dom.js';
 import { ThrottledDelayer, promiseWithResolvers } from '../../../../base/common/async.js';
 import { streamToBuffer } from '../../../../base/common/buffer.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -28,7 +28,6 @@ import { areWebviewContentOptionsEqual } from './webview.js';
 import { WebviewFindWidget } from './webviewFindWidget.js';
 import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from '../common/webview.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { $window } from '../../../../base/browser/window.js';
 var WebviewState;
 ( (function(WebviewState) {
     ( (function(Type) {
@@ -46,13 +45,17 @@ var WebviewState;
 })(WebviewState || (WebviewState = {})));
 const webviewIdContext = 'webviewId';
 let WebviewElement = class WebviewElement extends Disposable {
+    get window() { return typeof this._windowId === 'number' ? getWindowById(this._windowId)?.window : undefined; }
     get platform() { return 'browser'; }
     get element() { return this._element; }
     get isFocused() {
         if (!this._focused) {
             return false;
         }
-        if ($window.document.activeElement && $window.document.activeElement !== this.element) {
+        if (!this.window) {
+            return false;
+        }
+        if (this.window.document.activeElement && this.window.document.activeElement !== this.element) {
             return false;
         }
         return true;
@@ -68,6 +71,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._tunnelService = _tunnelService;
         this._accessibilityService = _accessibilityService;
         this.id = generateUuid();
+        this._windowId = undefined;
         this._expectedServiceWorkerVersion = 4;
         this._state = new WebviewState.Initializing([]);
         this._resourceLoadingCts = this._register(( new CancellationTokenSource()));
@@ -106,7 +110,6 @@ let WebviewElement = class WebviewElement extends Disposable {
         this.onDidStopFind = this._onDidStopFind.event;
         this.providedViewType = initInfo.providedViewType;
         this.origin = initInfo.origin ?? this.id;
-        this._encodedWebviewOriginPromise = parentOriginHash($window.origin, this.origin).then(id => this._encodedWebviewOrigin = id);
         this._options = initInfo.options;
         this.extension = initInfo.extension;
         this._content = {
@@ -121,32 +124,6 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._tunnelService
         )));
         this._element = this._createElement(initInfo.options, initInfo.contentOptions);
-        const subscription = this._register(addDisposableListener(initInfo.codeWindow ?? getActiveWindow(), 'message', (e) => {
-            if (!this._encodedWebviewOrigin || e?.data?.target !== this.id) {
-                return;
-            }
-            if (e.data.channel === 'webview-ready') {
-                if (this._messagePort) {
-                    return;
-                }
-                this._logService.debug(`Webview(${this.id}): webview ready`);
-                this._messagePort = e.ports[0];
-                this._messagePort.onmessage = (e) => {
-                    const handlers = this._messageHandlers.get(e.data.channel);
-                    if (!handlers) {
-                        console.log(`No handlers found for '${e.data.channel}'`);
-                        return;
-                    }
-                    handlers?.forEach(handler => handler(e.data.data, e));
-                };
-                this.element?.classList.add('ready');
-                if (this._state.type === 0 ) {
-                    this._state.pendingMessages.forEach(({ channel, data }) => this.doPostMessage(channel, data));
-                }
-                this._state = WebviewState.Ready;
-                subscription.dispose();
-            }
-        }));
         this._register(this.on('no-csp-found', () => {
             this.handleNoCspFound();
         }));
@@ -256,11 +233,6 @@ let WebviewElement = class WebviewElement extends Disposable {
         if (initInfo.options.enableFindWidget) {
             this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
         }
-        this._encodedWebviewOriginPromise.then(encodedWebviewOrigin => {
-            if (!this._disposed) {
-                this._initElement(encodedWebviewOrigin, this.extension, this._options);
-            }
-        });
     }
     dispose() {
         this._disposed = true;
@@ -311,7 +283,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         };
         return element;
     }
-    _initElement(encodedWebviewOrigin, extension, options) {
+    _initElement(encodedWebviewOrigin, extension, options, targetWindow) {
         const params = {
             id: this.id,
             origin: this.origin,
@@ -319,7 +291,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             extensionId: extension?.id.value ?? '',
             platform: this.platform,
             'vscode-resource-base-authority': webviewRootResourceAuthority,
-            parentOrigin: $window.origin,
+            parentOrigin: targetWindow.origin,
         };
         if (this._options.disableServiceWorker) {
             params.disableServiceWorker = 'true';
@@ -338,10 +310,18 @@ let WebviewElement = class WebviewElement extends Disposable {
         const relativeIframeSrc = ( FileAccess.asBrowserUri(`vs/workbench/contrib/webview/browser/pre/${fileName}`));
         this.element.setAttribute('src', `${( relativeIframeSrc.toString(true))}?${queryString}`);
     }
-    mountTo(element) {
+    mountTo(element, targetWindow) {
         if (!this.element) {
             return;
         }
+        this._windowId = targetWindow.vscodeWindowId;
+        this._encodedWebviewOriginPromise = parentOriginHash(targetWindow.origin, this.origin).then(id => this._encodedWebviewOrigin = id);
+        this._encodedWebviewOriginPromise.then(encodedWebviewOrigin => {
+            if (!this._disposed) {
+                this._initElement(encodedWebviewOrigin, this.extension, this._options, targetWindow);
+            }
+        });
+        this._registerMessageHandler(targetWindow);
         if (this._webviewFindWidget) {
             element.appendChild(this._webviewFindWidget.getDomNode());
         }
@@ -350,7 +330,7 @@ let WebviewElement = class WebviewElement extends Disposable {
                 this._stopBlockingIframeDragEvents();
             }));
         }
-        for (const node of [element, $window]) {
+        for (const node of [element, targetWindow]) {
             this._register(addDisposableListener(node, EventType.DRAG_END, () => {
                 this._stopBlockingIframeDragEvents();
             }));
@@ -358,6 +338,34 @@ let WebviewElement = class WebviewElement extends Disposable {
         element.id = this.id;
         element.appendChild(this.element);
     }
+    _registerMessageHandler(targetWindow) {
+        const subscription = this._register(addDisposableListener(targetWindow, 'message', (e) => {
+            if (!this._encodedWebviewOrigin || e?.data?.target !== this.id) {
+                return;
+            }
+            if (e.data.channel === 'webview-ready') {
+                if (this._messagePort) {
+                    return;
+                }
+                this._logService.debug(`Webview(${this.id}): webview ready`);
+                this._messagePort = e.ports[0];
+                this._messagePort.onmessage = (e) => {
+                    const handlers = this._messageHandlers.get(e.data.channel);
+                    if (!handlers) {
+                        console.log(`No handlers found for '${e.data.channel}'`);
+                        return;
+                    }
+                    handlers?.forEach(handler => handler(e.data.data, e));
+                };
+                this.element?.classList.add('ready');
+                if (this._state.type === 0 ) {
+                    this._state.pendingMessages.forEach(({ channel, data, resolve }) => resolve(this.doPostMessage(channel, data)));
+                }
+                this._state = WebviewState.Ready;
+                subscription.dispose();
+            }
+        }));
+    }
     _startBlockingIframeDragEvents() {
         if (this.element) {
             this.element.style.pointerEvents = 'none';
@@ -487,7 +495,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         Object.defineProperty(emulatedKeyboardEvent, 'target', {
             get: () => this.element,
         });
-        $window.dispatchEvent(emulatedKeyboardEvent);
+        this.window?.dispatchEvent(emulatedKeyboardEvent);
     }
     windowDidDragStart() {
         this._startBlockingIframeDragEvents();
@@ -594,9 +602,10 @@ let WebviewElement = class WebviewElement extends Disposable {
             if (!this.isFocused || !this.element) {
                 return;
             }
-            if ($window.document.activeElement && $window.document.activeElement !== this.element && $window.document.activeElement?.tagName !== 'BODY') {
+            if (this.window?.document.activeElement && this.window.document.activeElement !== this.element && this.window.document.activeElement?.tagName !== 'BODY') {
                 return;
             }
+            this.window?.document.body?.focus();
             this._send('focus', undefined);
         });
     }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js

@@ -1,17 +1,16 @@
 import { addDisposableListener, EventType } from '../../../../base/browser/dom.js';
-import { $window } from '../../../../base/browser/window.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 class WebviewWindowDragMonitor extends Disposable {
-    constructor(getWebview) {
+    constructor(targetWindow, getWebview) {
         super();
-        this._register(addDisposableListener($window, EventType.DRAG_START, () => {
+        this._register(addDisposableListener(targetWindow, EventType.DRAG_START, () => {
             getWebview()?.windowDidDragStart();
         }));
         const onDragEnd = () => {
             getWebview()?.windowDidDragEnd();
         };
-        this._register(addDisposableListener($window, EventType.DRAG_END, onDragEnd));
-        this._register(addDisposableListener($window, EventType.MOUSE_MOVE, currentEvent => {
+        this._register(addDisposableListener(targetWindow, EventType.DRAG_END, onDragEnd));
+        this._register(addDisposableListener(targetWindow, EventType.MOUSE_MOVE, currentEvent => {
             if (currentEvent.buttons === 0) {
                 onDragEnd();
             }

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { setParentFlowTo, trackFocus } from '../../../../base/browser/dom.js';
-import { $window } from '../../../../base/browser/window.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { isWeb } from '../../../../base/common/platform.js';
@@ -30,8 +29,8 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
     static { WebviewEditor_1 = this; }
     static { this.ID = 'WebviewEditor'; }
     get onDidFocus() { return this._onDidFocusWebview.event; }
-    constructor(telemetryService, themeService, storageService, _editorGroupsService, _editorService, _workbenchLayoutService, _hostService, _contextKeyService) {
-        super(WebviewEditor_1.ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, themeService, storageService, _editorGroupsService, _editorService, _workbenchLayoutService, _hostService, _contextKeyService) {
+        super(WebviewEditor_1.ID, group, telemetryService, themeService, storageService);
         this._editorGroupsService = _editorGroupsService;
         this._editorService = _editorService;
         this._workbenchLayoutService = _workbenchLayoutService;
@@ -43,7 +42,8 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
         this._onFocusWindowHandler = this._register(( new MutableDisposable()));
         this._onDidFocusWebview = this._register(( new Emitter()));
         this._scopedContextKeyService = this._register(( new MutableDisposable()));
-        this._register(Event.any(_editorGroupsService.activePart.onDidScroll, _editorGroupsService.activePart.onDidAddGroup, _editorGroupsService.activePart.onDidRemoveGroup, _editorGroupsService.activePart.onDidMoveGroup)(() => {
+        const part = _editorGroupsService.getPart(group);
+        this._register(Event.any(part.onDidScroll, part.onDidAddGroup, part.onDidRemoveGroup, part.onDidMoveGroup)(() => {
             if (this.webview && this._visible) {
                 this.synchronizeWebviewContainerDimensions(this.webview);
             }
@@ -60,7 +60,7 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
         this._element = element;
         this._element.id = `webview-editor-element-${generateUuid()}`;
         parent.appendChild(element);
-        this._scopedContextKeyService.value = this._contextKeyService.createScoped(element);
+        this._scopedContextKeyService.value = this._register(this._contextKeyService.createScoped(element));
     }
     dispose() {
         this._isDisposed = true;
@@ -85,7 +85,7 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
         }
         this.webview?.focus();
     }
-    setEditorVisible(visible, group) {
+    setEditorVisible(visible) {
         this._visible = visible;
         if (this.input instanceof WebviewInput && this.webview) {
             if (visible) {
@@ -95,7 +95,7 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
                 this.webview.release(this);
             }
         }
-        super.setEditorVisible(visible, group);
+        super.setEditorVisible(visible);
     }
     clearInput() {
         if (this.webview) {
@@ -118,9 +118,7 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
             return;
         }
         if (input instanceof WebviewInput) {
-            if (this.group) {
-                input.updateGroup(this.group.id);
-            }
+            input.updateGroup(this.group.id);
             if (!alreadyOwnsWebview) {
                 this.claimWebview(input);
             }
@@ -130,16 +128,16 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
         }
     }
     claimWebview(input) {
-        input.webview.claim(this, this.scopedContextKeyService);
+        input.claim(this, this.window, this.scopedContextKeyService);
         if (this._element) {
             this._element.setAttribute('aria-flowto', input.webview.container.id);
             setParentFlowTo(input.webview.container, this._element);
         }
         this._webviewVisibleDisposables.clear();
         this._webviewVisibleDisposables.add(this._editorGroupsService.createEditorDropTarget(input.webview.container, {
-            containsGroup: (group) => this.group?.id === group.id
+            containsGroup: (group) => this.group.id === group.id
         }));
-        this._webviewVisibleDisposables.add(( new WebviewWindowDragMonitor(() => this.webview)));
+        this._webviewVisibleDisposables.add(( new WebviewWindowDragMonitor(this.window, () => this.webview)));
         this.synchronizeWebviewContainerDimensions(input.webview);
         this._webviewVisibleDisposables.add(this.trackFocus(input.webview));
     }
@@ -147,7 +145,7 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
         if (!this._element?.isConnected) {
             return;
         }
-        const rootContainer = this._workbenchLayoutService.getContainer($window, "workbench.parts.editor" );
+        const rootContainer = this._workbenchLayoutService.getContainer(this.window, "workbench.parts.editor" );
         webview.layoutWebviewOverElement(this._element.parentElement, dimension, rootContainer);
     }
     trackFocus(webview) {
@@ -160,13 +158,13 @@ let WebviewEditor = class WebviewEditor extends EditorPane {
     }
 };
 WebviewEditor = WebviewEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IEditorGroupsService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IWorkbenchLayoutService)),
-    ( __param(6, IHostService)),
-    ( __param(7, IContextKeyService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IEditorGroupsService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IWorkbenchLayoutService)),
+    ( __param(7, IHostService)),
+    ( __param(8, IContextKeyService))
 ], WebviewEditor));
 export { CONTEXT_ACTIVE_WEBVIEW_PANEL_ID, WebviewEditor };