@codingame/monaco-vscode-view-common-service-override 31.0.0 → 32.0.0

package/vscode/src/vs/workbench/contrib/webview/browser/resourceLoading.d.ts

@@ -1,8 +1,7 @@
 import { VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 export declare namespace WebviewResourceResponse {
     enum Type {
@@ -16,8 +15,9 @@ export declare namespace WebviewResourceResponse {
         readonly etag: string | undefined;
         readonly mtime: number | undefined;
         readonly mimeType: string;
+        readonly size: number;
         readonly type = Type.Success;
-        constructor(stream: VSBufferReadableStream, etag: string | undefined, mtime: number | undefined, mimeType: string);
+        constructor(stream: VSBufferReadableStream, etag: string | undefined, mtime: number | undefined, mimeType: string, size: number);
     }
     const Failed: {
         readonly type: Type.Failed;
@@ -33,8 +33,12 @@ export declare namespace WebviewResourceResponse {
     }
     type StreamResponse = StreamSuccess | typeof Failed | typeof AccessDenied | NotModified;
 }
-export declare function loadLocalResource(requestUri: URI, options: {
+export declare function loadLocalResource(accessor: ServicesAccessor, requestUri: URI, options: {
     ifNoneMatch: string | undefined;
     roots: ReadonlyArray<URI>;
-}, uriIdentityService: IUriIdentityService, fileService: IFileService, logService: ILogService, token: CancellationToken): Promise<WebviewResourceResponse.StreamResponse>;
+    range?: {
+        readonly start: number;
+        readonly end?: number;
+    };
+}, token: CancellationToken): Promise<WebviewResourceResponse.StreamResponse>;
 export declare function getResourceToLoad(requestUri: URI, roots: ReadonlyArray<URI>, uriIdentityService: IUriIdentityService): URI | undefined;

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

@@ -3,6 +3,9 @@ import { isUNC } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpat
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { getWebviewContentMimeType } from '../../../../platform/webview/common/mimeTypes.js';
 
 var WebviewResourceResponse;
@@ -15,11 +18,12 @@ var WebviewResourceResponse;
         Type[Type["NotModified"] = 3] = "NotModified";
     })(Type = WebviewResourceResponse.Type || (WebviewResourceResponse.Type = {}));
     class StreamSuccess {
-        constructor(stream, etag, mtime, mimeType) {
+        constructor(stream, etag, mtime, mimeType, size) {
             this.stream = stream;
             this.etag = etag;
             this.mtime = mtime;
             this.mimeType = mimeType;
+            this.size = size;
             this.type = Type.Success;
         }
     }
@@ -39,7 +43,10 @@ var WebviewResourceResponse;
     }
     WebviewResourceResponse.NotModified = NotModified;
 })(WebviewResourceResponse || (WebviewResourceResponse = {}));
-async function loadLocalResource(requestUri, options, uriIdentityService, fileService, logService, token) {
+async function loadLocalResource(accessor, requestUri, options, token) {
+    const uriIdentityService = accessor.get(IUriIdentityService);
+    const fileService = accessor.get(IFileService);
+    const logService = accessor.get(ILogService);
     const resourceToLoad = getResourceToLoad(requestUri, options.roots, uriIdentityService);
     logService.trace(
         `Webview.loadLocalResource - trying to load resource. requestUri=${requestUri}, resourceToLoad=${resourceToLoad}`
@@ -52,13 +59,23 @@ async function loadLocalResource(requestUri, options, uriIdentityService, fileSe
     }
     const mime = getWebviewContentMimeType(requestUri);
     try {
-        const result = await fileService.readFileStream(resourceToLoad, {
+        const readOptions = {
             etag: options.ifNoneMatch
-        }, token);
+        };
+        if (options.range) {
+            readOptions.position = options.range.start;
+            if (options.range.end !== undefined) {
+                if (options.range.end < options.range.start) {
+                    return WebviewResourceResponse.Failed;
+                }
+                readOptions.length = options.range.end - options.range.start + 1;
+            }
+        }
+        const result = await fileService.readFileStream(resourceToLoad, readOptions, token);
         logService.trace(
             `Webview.loadLocalResource - Loaded. requestUri=${requestUri}, resourceToLoad=${resourceToLoad}`
         );
-        return new WebviewResourceResponse.StreamSuccess(result.value, result.etag, result.mtime, mime);
+        return new WebviewResourceResponse.StreamSuccess(result.value, result.etag, result.mtime, mime, result.size);
     } catch (err) {
         if (err instanceof FileOperationError) {
             const result = err.fileOperationResult;

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.d.ts

@@ -1,6 +1,5 @@
 import { IMouseWheelEvent } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent";
 import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
-import { VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
@@ -9,13 +8,11 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IRemoteAuthorityResolverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver.service";
 import { ITunnelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service";
-import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { WebviewThemeDataProvider } from "./themeing.js";
 import { IWebviewElement, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
@@ -23,12 +20,11 @@ import { WebviewFindDelegate, WebviewFindWidget } from "./webviewFindWidget.js";
 export declare class WebviewElement extends Disposable implements IWebviewElement, WebviewFindDelegate {
     protected readonly webviewThemeDataProvider: WebviewThemeDataProvider;
     private readonly _environmentService;
-    private readonly _fileService;
     private readonly _logService;
     private readonly _remoteAuthorityResolverService;
     private readonly _tunnelService;
     private readonly _accessibilityService;
-    private readonly _uriIdentityService;
+    private readonly _instantiationService;
     protected readonly id: string;
     /**
      * The provided identifier of this webview.
@@ -43,6 +39,7 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private _encodedWebviewOriginPromise?;
     private _encodedWebviewOrigin;
     protected get platform(): string;
+    private static readonly _supportsTransferableStreams;
     private readonly _expectedServiceWorkerVersion;
     private _element;
     protected get element(): HTMLIFrameElement | undefined;
@@ -52,6 +49,7 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private _content;
     private readonly _portMappingManager;
     private readonly _resourceLoadingCts;
+    private readonly _activeStreamControllers;
     private _contextKeyService;
     private _confirmBeforeClose;
     private readonly _focusDelayer;
@@ -68,7 +66,7 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private _disposed;
     extension: WebviewExtensionDescription | undefined;
     private readonly _options;
-    constructor(initInfo: WebviewInitInfo, webviewThemeDataProvider: WebviewThemeDataProvider, configurationService: IConfigurationService, contextMenuService: IContextMenuService, notificationService: INotificationService, _environmentService: IWorkbenchEnvironmentService, _fileService: IFileService, _logService: ILogService, _remoteAuthorityResolverService: IRemoteAuthorityResolverService, _tunnelService: ITunnelService, instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, _uriIdentityService: IUriIdentityService);
+    constructor(initInfo: WebviewInitInfo, webviewThemeDataProvider: WebviewThemeDataProvider, configurationService: IConfigurationService, contextMenuService: IContextMenuService, notificationService: INotificationService, _environmentService: IWorkbenchEnvironmentService, _logService: ILogService, _remoteAuthorityResolverService: IRemoteAuthorityResolverService, _tunnelService: ITunnelService, _accessibilityService: IAccessibilityService, _instantiationService: IInstantiationService);
     dispose(): void;
     setContextKeyService(contextKeyService: IContextKeyService): void;
     private readonly _onMissingCsp;
@@ -132,7 +130,6 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     redo(): void;
     private execCommand;
     private loadResource;
-    protected streamToBuffer(stream: VSBufferReadableStream): Promise<ArrayBufferLike>;
     private localLocalhost;
     focus(): void;
     private _doFocus;

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

@@ -4,10 +4,11 @@ import { isFirefox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/b
 import { getWindowById, getActiveElement, createElement, EventType, addDisposableListener, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { parentOriginHash } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/iframe';
 import { ThrottledDelayer, promiseWithResolvers } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { streamToBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { listenStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import { FileAccess, COI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -17,13 +18,11 @@ import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IRemoteAuthorityResolverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { ITunnelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service';
-import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { WebviewPortMappingManager } from '../../../../platform/webview/common/webviewPortMapping.js';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/common/webview';
@@ -32,6 +31,7 @@ import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-api/vsco
 import { WebviewFindWidget } from './webviewFindWidget.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
+var WebviewElement_1;
 var WebviewState;
 (function(WebviewState) {
     let Type;
@@ -52,12 +52,29 @@ var WebviewState;
 })(WebviewState || (WebviewState = {}));
 const webviewIdContext = "webviewId";
 let WebviewElement = class WebviewElement extends Disposable {
+    static {
+        WebviewElement_1 = this;
+    }
     get window() {
         return typeof this._windowId === "number" ? getWindowById(this._windowId)?.window : undefined;
     }
     get platform() {
         return "browser";
     }
+    static {
+        this._supportsTransferableStreams = ( new Lazy(() => {
+            try {
+                const stream = ( new ReadableStream());
+                const mc = ( new MessageChannel());
+                mc.port1.postMessage(stream, [stream]);
+                mc.port1.close();
+                mc.port2.close();
+                return true;
+            } catch {
+                return false;
+            }
+        }));
+    }
     get element() {
         return this._element;
     }
@@ -81,28 +98,26 @@ let WebviewElement = class WebviewElement extends Disposable {
         contextMenuService,
         notificationService,
         _environmentService,
-        _fileService,
         _logService,
         _remoteAuthorityResolverService,
         _tunnelService,
-        instantiationService,
         _accessibilityService,
-        _uriIdentityService
+        _instantiationService
     ) {
         super();
         this.webviewThemeDataProvider = webviewThemeDataProvider;
         this._environmentService = _environmentService;
-        this._fileService = _fileService;
         this._logService = _logService;
         this._remoteAuthorityResolverService = _remoteAuthorityResolverService;
         this._tunnelService = _tunnelService;
         this._accessibilityService = _accessibilityService;
-        this._uriIdentityService = _uriIdentityService;
+        this._instantiationService = _instantiationService;
         this.id = generateUuid();
         this._windowId = undefined;
-        this._expectedServiceWorkerVersion = 4;
+        this._expectedServiceWorkerVersion = 5;
         this._state = new WebviewState.Initializing([]);
         this._resourceLoadingCts = this._register(( new CancellationTokenSource()));
+        this._activeStreamControllers = ( new Set());
         this._focusDelayer = this._register(( new ThrottledDelayer(50)));
         this._onDidHtmlChange = this._register(( new Emitter()));
         this.onDidHtmlChange = this._onDidHtmlChange.event;
@@ -205,7 +220,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(15317, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(15622, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });
@@ -255,7 +270,10 @@ let WebviewElement = class WebviewElement extends Disposable {
                     path: decodeURIComponent(entry.path),
                     query: entry.query ? decodeURIComponent(entry.query) : entry.query
                 }));
-                this.loadResource(entry.id, uri, entry.ifNoneMatch);
+                this.loadResource(entry.id, uri, {
+                    ifNoneMatch: entry.ifNoneMatch,
+                    range: entry.range
+                }, this._resourceLoadingCts.token);
             } catch (e) {
                 this._send("did-load-resource", {
                     id: entry.id,
@@ -297,7 +315,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             }, undefined, undefined);
         }));
         if (initInfo.options.enableFindWidget) {
-            this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
+            this._webviewFindWidget = this._register(this._instantiationService.createInstance(WebviewFindWidget, this));
         }
     }
     dispose() {
@@ -312,6 +330,12 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._state.pendingMessages = [];
         }
         this._onDidDispose.fire();
+        for (const controller of this._activeStreamControllers) {
+            try {
+                controller.close();
+            } catch {}
+        }
+        this._activeStreamControllers.clear();
         this._resourceLoadingCts.dispose(true);
         super.dispose();
     }
@@ -662,25 +686,106 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._send("execCommand", command);
         }
     }
-    async loadResource(id, uri, ifNoneMatch) {
+    async loadResource(id, uri, options, token) {
+        if (this._disposed) {
+            return;
+        }
         try {
-            const result = await loadLocalResource(uri, {
-                ifNoneMatch,
-                roots: this._content.options.localResourceRoots || []
-            }, this._uriIdentityService, this._fileService, this._logService, this._resourceLoadingCts.token);
+            const result = await this._instantiationService.invokeFunction(loadLocalResource, uri, {
+                ifNoneMatch: options.ifNoneMatch,
+                roots: this._content.options.localResourceRoots || [],
+                range: options.range
+            }, token);
+            if (this._disposed) {
+                return;
+            }
             switch (result.type) {
             case WebviewResourceResponse.Type.Success:
                 {
-                    const buffer = await this.streamToBuffer(result.stream);
-                    return this._send("did-load-resource", {
-                        id,
-                        status: 200,
-                        path: uri.path,
-                        mime: result.mimeType,
-                        data: buffer,
-                        etag: result.etag,
-                        mtime: result.mtime
-                    }, [buffer]);
+                    const range = options.range;
+                    const requestedRangeEnd = range?.end !== undefined ? range.end : result.size - 1;
+                    const rangeEnd = Math.min(requestedRangeEnd, result.size - 1);
+                    const rangeHeader = range ? `bytes ${range.start}-${rangeEnd}/${result.size}` : undefined;
+                    if (WebviewElement_1._supportsTransferableStreams.value) {
+                        const stream = ( new ReadableStream({
+                            start: controller => {
+                                this._activeStreamControllers.add(controller);
+                                let closed = false;
+                                const close = () => {
+                                    if (!closed) {
+                                        closed = true;
+                                        this._activeStreamControllers.delete(controller);
+                                        try {
+                                            controller.close();
+                                        } catch {}
+                                    }
+                                };
+                                listenStream(result.stream, {
+                                    onData: chunk => {
+                                        if (!closed) {
+                                            try {
+                                                controller.enqueue(( new Uint8Array(chunk.buffer.buffer, chunk.buffer.byteOffset, chunk.buffer.byteLength)));
+                                            } catch {
+                                                closed = true;
+                                                this._activeStreamControllers.delete(controller);
+                                            }
+                                        }
+                                    },
+                                    onError: err => {
+                                        if (!closed) {
+                                            closed = true;
+                                            this._activeStreamControllers.delete(controller);
+                                            try {
+                                                controller.error(err);
+                                            } catch {}
+                                        }
+                                    },
+                                    onEnd: () => close()
+                                }, token);
+                            }
+                        }));
+                        this._send("did-load-resource", {
+                            id,
+                            status: range ? 206 : 200,
+                            path: uri.path,
+                            mime: result.mimeType,
+                            etag: result.etag,
+                            mtime: result.mtime,
+                            range: rangeHeader,
+                            stream
+                        }, [stream]);
+                    } else {
+                        this._send("did-load-resource", {
+                            id,
+                            status: range ? 206 : 200,
+                            path: uri.path,
+                            mime: result.mimeType,
+                            etag: result.etag,
+                            mtime: result.mtime,
+                            range: rangeHeader
+                        });
+                        listenStream(result.stream, {
+                            onData: chunk => {
+                                const data = ( new Uint8Array(chunk.buffer.buffer, chunk.buffer.byteOffset, chunk.buffer.byteLength));
+                                this._send("did-load-resource-chunk", {
+                                    id,
+                                    data
+                                }, [data.buffer]);
+                            },
+                            onError: () => {
+                                this._send("did-load-resource-end", {
+                                    id,
+                                    error: true
+                                });
+                            },
+                            onEnd: () => {
+                                this._send("did-load-resource-end", {
+                                    id
+                                });
+                            }
+                        }, token);
+                    }
+                    return;
                 }
             case WebviewResourceResponse.Type.NotModified:
                 {
@@ -708,10 +813,6 @@ let WebviewElement = class WebviewElement extends Disposable {
             path: uri.path
         });
     }
-    async streamToBuffer(stream) {
-        const vsBuffer = await streamToBuffer(stream);
-        return vsBuffer.buffer.buffer;
-    }
     async localLocalhost(id, origin) {
         const authority = this._environmentService.remoteAuthority;
         const resolveAuthority = authority ? await this._remoteAuthorityResolverService.resolveAuthority(authority) : undefined;
@@ -783,6 +884,6 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._webviewFindWidget?.find(previous);
     }
 };
-WebviewElement = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IContextMenuService)), ( __param(4, INotificationService)), ( __param(5, IWorkbenchEnvironmentService)), ( __param(6, IFileService)), ( __param(7, ILogService)), ( __param(8, IRemoteAuthorityResolverService)), ( __param(9, ITunnelService)), ( __param(10, IInstantiationService)), ( __param(11, IAccessibilityService)), ( __param(12, IUriIdentityService))], WebviewElement));
+WebviewElement = WebviewElement_1 = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IContextMenuService)), ( __param(4, INotificationService)), ( __param(5, IWorkbenchEnvironmentService)), ( __param(6, ILogService)), ( __param(7, IRemoteAuthorityResolverService)), ( __param(8, ITunnelService)), ( __param(9, IAccessibilityService)), ( __param(10, IInstantiationService))], WebviewElement));
 
 export { WebviewElement };

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

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(15348, "Show find"));
+        this.LABEL = ( localize(15653, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(15349, "Stop find"));
+        this.LABEL = ( localize(15654, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(15350, "Find next"));
+        this.LABEL = ( localize(15655, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(15351, "Find previous"));
+        this.LABEL = ( localize(15656, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(15352, "Reload Webviews"));
+        this.LABEL = ( localize2(15657, "Reload Webviews"));
     }
     constructor() {
         super({

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

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15354, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15659, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.d.ts

@@ -32,7 +32,6 @@ export declare class WebviewViewPane extends ViewPane {
     private _activated;
     private _container?;
     private _rootContainer?;
-    private _resizeObserver?;
     private readonly defaultTitle;
     private setTitle;
     private badge;
@@ -40,7 +39,6 @@ export declare class WebviewViewPane extends ViewPane {
     private readonly memento;
     private readonly viewState;
     private readonly extensionId?;
-    private _repositionTimeout?;
     constructor(options: IViewletViewOptions, configurationService: IConfigurationService, contextKeyService: IContextKeyService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, openerService: IOpenerService, hoverService: IHoverService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, activityService: IActivityService, extensionService: IExtensionService, progressService: IProgressService, storageService: IStorageService, viewService: IViewsService, webviewService: IWebviewService, webviewViewService: IWebviewViewService);
     private readonly _onDidChangeVisibility;
     readonly onDidChangeVisibility: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<boolean>;
@@ -50,14 +48,11 @@ export declare class WebviewViewPane extends ViewPane {
     focus(): void;
     protected renderBody(container: HTMLElement): void;
     saveState(): void;
-    protected layoutBody(height: number, width: number): void;
     private updateTreeVisibility;
     private activate;
     protected updateTitle(value: string | undefined): void;
     protected updateBadge(badge: IViewBadge | undefined): void;
     private withProgress;
-    onDidScrollRoot(): void;
-    private doLayoutWebview;
     private layoutWebview;
     private findRootContainer;
 }

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { DisposableResizeObserver, Dimension, getWindow, EventType, addDisposableListener, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { getWindow, EventType, addDisposableListener, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -93,7 +93,6 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
     }
     dispose() {
         this._onDispose.fire();
-        clearTimeout(this._repositionTimeout);
         super.dispose();
     }
     focus() {
@@ -104,14 +103,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         super.renderBody(container);
         this._container = container;
         this._rootContainer = undefined;
-        if (!this._resizeObserver) {
-            this._resizeObserver = this._register(( new DisposableResizeObserver(() => {
-                setTimeout(() => {
-                    this.layoutWebview();
-                }, 0);
-            })));
-            this._resizeObserver.observe(container);
-        }
+        this.layoutWebview();
     }
     saveState() {
         if (this._webview.value) {
@@ -120,10 +112,6 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         this.memento.saveMemento();
         super.saveState();
     }
-    layoutBody(height, width) {
-        super.layoutBody(height, width);
-        this.layoutWebview(( new Dimension(width, height)));
-    }
     updateTreeVisibility() {
         if (this.isBodyVisible()) {
             this.activate();
@@ -152,9 +140,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         });
         webview.state = this.viewState[storageKeys.webviewState];
         this._webview.value = webview;
-        if (this._container) {
-            this.layoutWebview();
-        }
+        this.layoutWebview();
         this._webviewDisposables.add(toDisposable(() => {
             this._webview.value?.release(this);
         }));
@@ -236,10 +222,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
             delay: 500
         }, task);
     }
-    onDidScrollRoot() {
-        this.layoutWebview();
-    }
-    doLayoutWebview(dimension) {
+    layoutWebview() {
         const webviewEntry = this._webview.value;
         if (!this._container || !webviewEntry) {
             return;
@@ -247,12 +230,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         if (!this._rootContainer || !this._rootContainer.isConnected) {
             this._rootContainer = this.findRootContainer(this._container);
         }
-        webviewEntry.layoutWebviewOverElement(this._container, dimension, this._rootContainer);
-    }
-    layoutWebview(dimension) {
-        this.doLayoutWebview(dimension);
-        clearTimeout(this._repositionTimeout);
-        this._repositionTimeout = setTimeout(() => this.doLayoutWebview(dimension), 200);
+        webviewEntry.setAnchorElement(this._container, this._rootContainer);
     }
     findRootContainer(container) {
         return findParentWithClass(container, "monaco-scrollable-element") ?? undefined;