@codingame/monaco-vscode-view-common-service-override 19.1.4 → 20.0.1

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js

@@ -23,7 +23,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { AbstractTextEditor } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/browser/parts/editor/textEditor';
+import { AbstractTextEditor } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/textEditor';
 import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { applyTextEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
@@ -118,7 +118,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(8343, "Text Merge Editor");
+        return localize(8500, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js

@@ -2,7 +2,7 @@
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
-import { DocumentLineRangeMap } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { DocumentLineRangeMap } from '@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
 import { ReentrancyBarrier } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/base/common/controlFlow';
 import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.d.ts

@@ -4,7 +4,7 @@ import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { MergeEditorModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
-import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from "@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from "@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
 import { BaseCodeEditorView } from "./editors/baseCodeEditorView.js";
 import { CodeEditorView } from "./editors/codeEditorView.js";
 import { InputCodeEditorView } from "./editors/inputCodeEditorView.js";

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -8,7 +8,7 @@ import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { MergeEditorLineRange } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { MergeEditorLineRange } from '@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derivedObservableWithWritableCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
@@ -222,7 +222,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(8344, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(8501, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.js

@@ -1,9 +1,9 @@
 
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CompareResult } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { MergeEditorLineRange } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { MergeEditorLineRange } from '@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { join } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
+import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
 import { getAlignments } from './lineAlignment.js';
 
 class ViewZoneComputer {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -24,11 +24,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(9029, "Keyboard Layout"));
+        const name = ( localize(9186, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9030, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9187, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -40,7 +40,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(9030, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9187, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9030, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9187, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -67,11 +67,11 @@ KeyboardLayoutPickerContribution = ( __decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        9031,
+        9188,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9032,
+        9189,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -82,7 +82,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(9033, "Change Keyboard Layout")),
+            title: ( localize2(9190, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -112,17 +112,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(9034, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9191, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9035, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9192, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9036, "Auto Detect")),
+            label: ( localize(9193, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9037, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9194, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9038, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9195, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -20,7 +20,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                9561,
+                9718,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -30,7 +30,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                9562,
+                9719,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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

@@ -22,12 +22,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(11712, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(11713, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(11962, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(11963, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(11714, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(11964, 'whether type hierarchy shows super types or subtypes')) }
 ));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(11715, "No results")));
+                this._widget.showMessage(( localize(11965, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(11716, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(11966, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(11717, 'Peek Type Hierarchy')),
+            title: ( localize2(11967, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(11718, 'Show Supertypes')),
+            title: ( localize2(11968, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -189,7 +189,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(11719, 'Show Subtypes')),
+            title: ( localize2(11969, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -211,7 +211,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(11720, 'Refocus Type Hierarchy')),
+            title: ( localize2(11970, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(11721, 'Close')),
+            title: ( localize(11971, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -265,13 +265,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(11722, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(11723, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(11972, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(11973, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(11724, "Loading...")));
+        this.setTitle(( localize(11974, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -290,8 +290,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localize(11725, "No supertypes of '{0}'", model.root.name))
-                : ( localize(11726, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(11975, "No supertypes of '{0}'", model.root.name))
+                : ( localize(11976, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

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

@@ -106,14 +106,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(11727, "Type Hierarchy");
+        return localize(11977, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(11728, "supertypes of {0}", element.item.name);
+            return localize(11978, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(11729, "subtypes of {0}", element.item.name);
+            return localize(11979, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -6,7 +6,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 export declare class OverlayWebview extends Disposable implements IOverlayWebview {
     private readonly _layoutService;
@@ -64,8 +64,6 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     readonly onDidBlur: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private readonly _onDidClickLink;
     readonly onDidClickLink: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<string>;
-    private readonly _onDidReload;
-    readonly onDidReload: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private readonly _onDidScroll;
     readonly onDidScroll: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<{
         readonly scrollYPercentage: number;
@@ -82,6 +80,10 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     onFatalError: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<{
         readonly message: string;
     }>;
+    readonly intrinsicContentSize: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
+        readonly width: number;
+        readonly height: number;
+    } | undefined, void>;
     postMessage(message: any, transfer?: readonly ArrayBuffer[]): Promise<boolean>;
     focus(): void;
     reload(): void;

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

@@ -4,11 +4,14 @@ import { getWindowById, createElement } from '@codingame/monaco-vscode-api/vscod
 import { FastDomNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/fastDomNode';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let OverlayWebview = class OverlayWebview extends Disposable {
     get window() { return getWindowById(this._windowId, true).window; }
@@ -37,8 +40,6 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this.onDidBlur = this._onDidBlur.event;
         this._onDidClickLink = this._register(( new Emitter()));
         this.onDidClickLink = this._onDidClickLink.event;
-        this._onDidReload = this._register(( new Emitter()));
-        this.onDidReload = this._onDidReload.event;
         this._onDidScroll = this._register(( new Emitter()));
         this.onDidScroll = this._onDidScroll.event;
         this._onDidUpdateState = this._register(( new Emitter()));
@@ -51,6 +52,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this.onDidWheel = this._onDidWheel.event;
         this._onFatalError = this._register(( new Emitter()));
         this.onFatalError = this._onFatalError.event;
+        this.intrinsicContentSize = observableValue('WebviewIntrinsicContentSize', undefined);
         this.providedViewType = initInfo.providedViewType;
         this.origin = initInfo.origin ?? generateUuid();
         this._title = initInfo.title;
@@ -195,8 +197,10 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this._webviewEvents.add(webview.onMessage(x => { this._onMessage.fire(x); }));
             this._webviewEvents.add(webview.onMissingCsp(x => { this._onMissingCsp.fire(x); }));
             this._webviewEvents.add(webview.onDidWheel(x => { this._onDidWheel.fire(x); }));
-            this._webviewEvents.add(webview.onDidReload(() => { this._onDidReload.fire(); }));
             this._webviewEvents.add(webview.onFatalError(x => { this._onFatalError.fire(x); }));
+            this._webviewEvents.add(autorun(reader => {
+                this.intrinsicContentSize.set(reader.readObservable(webview.intrinsicContentSize), undefined, undefined);
+            }));
             this._webviewEvents.add(webview.onDidScroll(x => {
                 this._initialScrollProgress = x.scrollYPercentage;
                 this._onDidScroll.fire(x);

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IWorkbenchColorTheme } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IWorkbenchThemeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
-import { WebviewStyles } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewStyles } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 interface WebviewThemeData {
     readonly activeTheme: string;
     readonly themeLabel: string;

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

@@ -17,7 +17,7 @@ import { IRemoteAuthorityResolverService } from "@codingame/monaco-vscode-api/vs
 import { ITunnelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { WebviewFindDelegate, WebviewFindWidget } from "./webviewFindWidget.js";
 export declare class WebviewElement extends Disposable implements IWebview, WebviewFindDelegate {
     protected readonly webviewThemeDataProvider: WebviewThemeDataProvider;
@@ -53,6 +53,10 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     private readonly _messageHandlers;
     protected readonly _webviewFindWidget: WebviewFindWidget | undefined;
     readonly checkImeCompletionState = true;
+    readonly intrinsicContentSize: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
+        readonly width: number;
+        readonly height: number;
+    } | undefined, void>;
     private _disposed;
     extension: WebviewExtensionDescription | undefined;
     private readonly _options;
@@ -63,8 +67,6 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     readonly onMissingCsp: Event<ExtensionIdentifier>;
     private readonly _onDidClickLink;
     readonly onDidClickLink: Event<string>;
-    private readonly _onDidReload;
-    readonly onDidReload: Event<void>;
     private readonly _onMessage;
     readonly onMessage: Event<WebviewMessageReceivedEvent>;
     private readonly _onDidScroll;
@@ -99,6 +101,7 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     private _hasAlertedAboutMissingCsp;
     private handleNoCspFound;
     reload(): void;
+    reinitializeAfterDismount(): void;
     setHtml(html: string): void;
     setTitle(title: string): void;
     set contentOptions(options: WebviewContentOptions);

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

@@ -1,13 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { isFirefox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
-import { getWindowById, createElement, EventType, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { getWindowById, 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 { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { FileAccess, COI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
@@ -26,8 +27,9 @@ import { WebviewPortMappingManager } from '../../../../platform/webview/common/w
 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';
 import { loadLocalResource, WebviewResourceResponse } from './resourceLoading.js';
-import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewFindWidget } from './webviewFindWidget.js';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 var WebviewState;
 (function (WebviewState) {
@@ -81,13 +83,12 @@ let WebviewElement = class WebviewElement extends Disposable {
         this.onDidHtmlChange = this._onDidHtmlChange.event;
         this._messageHandlers = ( new Map());
         this.checkImeCompletionState = true;
+        this.intrinsicContentSize = observableValue('WebviewIntrinsicContentSize', undefined);
         this._disposed = false;
         this._onMissingCsp = this._register(( new Emitter()));
         this.onMissingCsp = this._onMissingCsp.event;
         this._onDidClickLink = this._register(( new Emitter()));
         this.onDidClickLink = this._onDidClickLink.event;
-        this._onDidReload = this._register(( new Emitter()));
-        this.onDidReload = this._onDidReload.event;
         this._onMessage = this._register(( new Emitter()));
         this.onMessage = this._onMessage.event;
         this._onDidScroll = this._register(( new Emitter()));
@@ -157,7 +158,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(12029, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(12279, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -229,6 +230,9 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._register(this.on('drag', (event) => {
             this.handleDragEvent('drag', event);
         }));
+        this._register(this.on('updated-intrinsic-content-size', (event) => {
+            this.intrinsicContentSize.set({ width: event.width, height: event.height }, undefined, undefined);
+        }));
         if (initInfo.options.enableFindWidget) {
             this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
         }
@@ -420,10 +424,12 @@ let WebviewElement = class WebviewElement extends Disposable {
     }
     reload() {
         this.doUpdateContent(this._content);
-        const subscription = this._register(this.on('did-load', () => {
-            this._onDidReload.fire();
-            subscription.dispose();
-        }));
+    }
+    reinitializeAfterDismount() {
+        this._state = new WebviewState.Initializing([]);
+        this._messagePort = undefined;
+        this.mountTo(this.element.parentElement, getWindow(this.element));
+        this.reload();
     }
     setHtml(html) {
         this.doUpdateContent({ ...this._content, html });

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

@@ -5,7 +5,7 @@ import { IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { SimpleFindWidget } from '@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview';
 
 let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
     async _getResultCount(dataChanged) {

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 export declare class WebviewService extends Disposable implements IWebviewService {
     protected readonly _instantiationService: IInstantiationService;

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

@@ -6,16 +6,16 @@ import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(12030, "Show find")); }
+    static { this.LABEL = ( localize(12280, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(12031, "Stop find")); }
+    static { this.LABEL = ( localize(12281, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(12032, 'Find next')); }
+    static { this.LABEL = ( localize(12282, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(12033, 'Find previous')); }
+    static { this.LABEL = ( localize(12283, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(12034, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(12284, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.d.ts

@@ -1,9 +1,9 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorSerializer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { WebviewIcons } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewIconManager";
-import { WebviewInput } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 export type SerializedWebviewOptions = WebviewOptions & WebviewContentOptions;
 interface SerializedIconPath {

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
-import { WebviewInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 
 let WebviewEditorInputSerializer = class WebviewEditorInputSerializer {