@codingame/monaco-vscode-view-common-service-override 26.2.2 → 27.0.0

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

@@ -139,7 +139,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9702, "Result"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(10405, "Result"))));
             reset(
                 this.htmlElements.description,
                 ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, {
@@ -158,7 +158,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             const count = model.unhandledConflictsCount.read(reader);
-            const text = count === 1 ? ( localize(9703, "{0} Conflict Remaining", count)) : ( localize(9704, "{0} Conflicts Remaining ", count));
+            const text = count === 1 ? ( localize(10406, "{0} Conflict Remaining", count)) : ( localize(10407, "{0} Conflicts Remaining ", count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -169,7 +169,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.model.telemetry.reportConflictCounterClicked();
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
-                tooltip: count > 0 ? ( localize(9705, "Go to next conflict")) : ( localize(9706, "All conflicts handled, the merge can be completed now."))
+                tooltip: count > 0 ? ( localize(10408, "Go to next conflict")) : ( localize(10409, "All conflicts handled, the merge can be completed now."))
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -129,7 +129,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             this.inputResultView,
             this._layoutModeObs
         )));
-        this._onDidChangeSizeConstraints = ( new Emitter());
+        this._onDidChangeSizeConstraints = this._register(( new Emitter()));
         this.onDidChangeSizeConstraints = this._onDidChangeSizeConstraints.event;
         this.baseViewDisposables = this._register(( new DisposableStore()));
         this.showNonConflictingChangesStore = this.instantiationService.createInstance(PersistentStore, "mergeEditor/showNonConflictingChanges");
@@ -149,7 +149,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(9707, "Text Merge Editor");
+        return localize(10410, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

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

@@ -238,7 +238,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(9708, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(10411, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

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

@@ -26,11 +26,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(10382, "Keyboard Layout"));
+        const name = ( localize(11127, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(10383, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(11128, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -42,7 +42,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(10383, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(11128, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -50,7 +50,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
                 });
             } else {
-                const text = ( localize(10383, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(11128, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -68,17 +68,17 @@ registerWorkbenchContribution2(
     WorkbenchPhase.BlockStartup
 );
 const DEFAULT_CONTENT = [`// ${( localize(
-    10384,
+    11129,
     "Defines the keyboard layout used in VS Code in the browser environment."
 ))}`, `// ${( localize(
-    10385,
+    11130,
     "Open VS Code and run \"Developer: Inspect Key Mappings (JSON)\" from Command Palette."
 ))}`, ``, `// Once you have the keyboard layout info, please paste it below.`, "\n"].join("\n");
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(10386, "Change Keyboard Layout")),
+            title: ( localize2(11131, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -113,21 +113,21 @@ registerAction2(class extends Action2 {
             const platform = isMacintosh ? "Mac" : isWindows ? "Win" : "Linux";
             picks.unshift({
                 type: "separator",
-                label: ( localize(10387, "Keyboard Layouts ({0})", platform))
+                label: ( localize(11132, "Keyboard Layouts ({0})", platform))
             });
         }
         const configureKeyboardLayout = {
-            label: ( localize(10388, "Configure Keyboard Layout"))
+            label: ( localize(11133, "Configure Keyboard Layout"))
         };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(10389, "Auto Detect")),
+            label: ( localize(11134, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(10390, "Select Keyboard Layout")),
+            placeHolder: ( localize(11135, "Select Keyboard Layout")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -153,7 +153,7 @@ registerAction2(class extends Action2 {
                     }
                 });
             }, error => {
-                throw ( new Error(( localize(10391, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(11136, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -21,7 +21,7 @@ registerWorkbenchContribution2(
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                10942,
+                11697,
                 "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."
             ))
         },
@@ -31,7 +31,7 @@ registerWorkbenchContribution2(
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                10943,
+                11698,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         }

package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.js

@@ -22,7 +22,7 @@ let SyncScroll = class SyncScroll extends Disposable {
         this.statusbarService = statusbarService;
         this.paneInitialScrollTop = ( new Map());
         this.syncScrollDispoasbles = this._register(( new DisposableStore()));
-        this.paneDisposables = ( new DisposableStore());
+        this.paneDisposables = this._register(( new DisposableStore()));
         this.statusBarEntry = this._register(( new MutableDisposable()));
         this.isActive = false;
         this._reentrancyBarrier = ( new ReentrancyBarrier());
@@ -122,8 +122,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(11160, "Scrolling Locked"));
-                const tooltip = ( localize(11161, "Lock Scrolling Enabled"));
+                const text = ( localize(11915, "Scrolling Locked"));
+                const tooltip = ( localize(11916, "Lock Scrolling Enabled"));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -148,13 +148,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.toggleLockedScrolling",
                     title: {
-                        ...( localize2(11162, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(11163, "Locked Scrolling"))
+                        ...( localize2(11917, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(11918, "Locked Scrolling"))
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(11164, "Synchronize Scrolling Editors"))
+                        description: ( localize(11919, "Synchronize Scrolling Editors"))
                     }
                 });
             }
@@ -167,8 +167,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.holdLockedScrolling",
                     title: {
-                        ...( localize2(11165, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(11166, "Locked Scrolling"))
+                        ...( localize2(11920, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(11921, "Locked Scrolling"))
                     },
                     category: Categories.View
                 });

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

@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(13388, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(13389, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(14238, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(14239, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(13390, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(14240, "whether type hierarchy shows super types or subtypes"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(13391, "No results")));
+                this._widget.showMessage(( localize(14241, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(13392, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(14242, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(13393, "Peek Type Hierarchy")),
+            title: ( localize2(14243, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(13394, "Show Supertypes")),
+            title: ( localize2(14244, "Show Supertypes")),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSubtypes",
-            title: ( localize2(13395, "Show Subtypes")),
+            title: ( localize2(14245, "Show Subtypes")),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusTypeHierarchy",
-            title: ( localize2(13396, "Refocus Type Hierarchy")),
+            title: ( localize2(14246, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(13397, "Close")),
+            title: ( localize(14247, "Close")),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13398, "Supertypes of '{0}'", element.model.root.name)) : ( localize(13399, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14248, "Supertypes of '{0}'", element.model.root.name)) : ( localize(14249, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(13400, "Loading...")));
+        this.setTitle(( localize(14250, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13401, "No supertypes of '{0}'", model.root.name)) : ( localize(13402, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14251, "No supertypes of '{0}'", model.root.name)) : ( localize(14252, "No subtypes of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

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

@@ -97,6 +97,7 @@ class TypeRenderer {
         const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
         template.icon.classList.add(
             "inline",
+            "codicon-colored",
             ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind))
         );
         template.label.setLabel(element.item.name, element.item.detail, {
@@ -122,13 +123,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(13403, "Type Hierarchy");
+        return localize(14253, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(13404, "supertypes of {0}", element.item.name);
+            return localize(14254, "supertypes of {0}", element.item.name);
         } else {
-            return localize(13405, "subtypes of {0}", element.item.name);
+            return localize(14255, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -6,6 +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 { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 /**
@@ -15,6 +16,7 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     private readonly _layoutService;
     private readonly _webviewService;
     private readonly _baseContextKeyService;
+    private readonly _editorGroupsService;
     private _isFirstLoad;
     private readonly _firstLoadPendingMessages;
     private readonly _webview;
@@ -36,15 +38,15 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     readonly providedViewType?: string;
     origin: string;
     private _container;
-    constructor(initInfo: WebviewInitInfo, _layoutService: IWorkbenchLayoutService, _webviewService: IWebviewService, _baseContextKeyService: IContextKeyService);
+    constructor(initInfo: WebviewInitInfo, _layoutService: IWorkbenchLayoutService, _webviewService: IWebviewService, _baseContextKeyService: IContextKeyService, _editorGroupsService: IEditorGroupsService);
     get isFocused(): boolean;
     private _isDisposed;
     private readonly _onDidDispose;
     readonly onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     dispose(): void;
     get container(): HTMLElement;
-    claim(owner: any, targetWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;
-    release(owner: any): void;
+    claim(owner: unknown, targetWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;
+    release(owner: unknown): void;
     layoutWebviewOverElement(element: HTMLElement, dimension?: Dimension, clippingContainer?: HTMLElement): void;
     private doLayoutWebviewOverElement;
     private _show;
@@ -87,7 +89,7 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
         readonly width: number;
         readonly height: number;
     } | undefined, void>;
-    postMessage(message: any, transfer?: readonly ArrayBuffer[]): Promise<boolean>;
+    postMessage(message: unknown, transfer?: readonly ArrayBuffer[]): Promise<boolean>;
     focus(): void;
     reload(): void;
     selectAll(): void;

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getWindowById, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { getWindowById, createElement, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 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';
@@ -8,6 +8,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 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 { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-api/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';
@@ -17,11 +18,18 @@ let OverlayWebview = class OverlayWebview extends Disposable {
     get window() {
         return getWindowById(this._windowId, true).window;
     }
-    constructor(initInfo, _layoutService, _webviewService, _baseContextKeyService) {
+    constructor(
+        initInfo,
+        _layoutService,
+        _webviewService,
+        _baseContextKeyService,
+        _editorGroupsService
+    ) {
         super();
         this._layoutService = _layoutService;
         this._webviewService = _webviewService;
         this._baseContextKeyService = _baseContextKeyService;
+        this._editorGroupsService = _editorGroupsService;
         this._isFirstLoad = true;
         this._firstLoadPendingMessages = ( new Set());
         this._webview = this._register(( new MutableDisposable()));
@@ -86,7 +94,14 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             node.style.overflow = "hidden";
             this._container = ( new FastDomNode(node));
             this._container.setVisibility("hidden");
-            this._layoutService.getContainer(this.window).appendChild(node);
+            const modalEditorContainer = this._editorGroupsService.activeModalEditorPart?.modalElement;
+            let root;
+            if (isHTMLElement(modalEditorContainer)) {
+                root = modalEditorContainer;
+            } else {
+                root = this._layoutService.getContainer(this.window);
+            }
+            root.appendChild(node);
         }
         return this._container.domNode;
     }
@@ -360,7 +375,7 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this._webview.value?.setContextKeyService(contextKeyService);
     }
 };
-OverlayWebview = ( __decorate([( __param(1, IWorkbenchLayoutService)), ( __param(2, IWebviewService)), ( __param(3, IContextKeyService))], OverlayWebview));
+OverlayWebview = ( __decorate([( __param(1, IWorkbenchLayoutService)), ( __param(2, IWebviewService)), ( __param(3, IContextKeyService)), ( __param(4, IEditorGroupsService))], OverlayWebview));
 function computeClippingRect(frameRect, clipper) {
     const rootRect = clipper.getBoundingClientRect();
     const top = Math.max(rootRect.top - frameRect.top, 0);

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

@@ -3,6 +3,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 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 { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 export declare namespace WebviewResourceResponse {
     enum Type {
         Success = 0,
@@ -35,4 +36,5 @@ export declare namespace WebviewResourceResponse {
 export declare function loadLocalResource(requestUri: URI, options: {
     ifNoneMatch: string | undefined;
     roots: ReadonlyArray<URI>;
-}, fileService: IFileService, logService: ILogService, token: CancellationToken): Promise<WebviewResourceResponse.StreamResponse>;
+}, uriIdentityService: IUriIdentityService, fileService: IFileService, logService: ILogService, 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

@@ -1,7 +1,6 @@
 
 import { isUNC } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { normalize, sep } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 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 { getWebviewContentMimeType } from '../../../../platform/webview/common/mimeTypes.js';
@@ -40,8 +39,8 @@ var WebviewResourceResponse;
     }
     WebviewResourceResponse.NotModified = NotModified;
 })(WebviewResourceResponse || (WebviewResourceResponse = {}));
-async function loadLocalResource(requestUri, options, fileService, logService, token) {
-    const resourceToLoad = getResourceToLoad(requestUri, options.roots);
+async function loadLocalResource(requestUri, options, uriIdentityService, fileService, logService, token) {
+    const resourceToLoad = getResourceToLoad(requestUri, options.roots, uriIdentityService);
     logService.trace(
         `Webview.loadLocalResource - trying to load resource. requestUri=${requestUri}, resourceToLoad=${resourceToLoad}`
     );
@@ -76,25 +75,34 @@ async function loadLocalResource(requestUri, options, fileService, logService, t
         return WebviewResourceResponse.Failed;
     }
 }
-function getResourceToLoad(requestUri, roots) {
+function getResourceToLoad(requestUri, roots, uriIdentityService) {
+    const requestUriNoQueryString = requestUri.with({
+        query: ""
+    });
     for (const root of roots) {
-        if (containsResource(root, requestUri)) {
+        if (containsResource(root, requestUriNoQueryString, uriIdentityService)) {
             return normalizeResourcePath(requestUri);
         }
     }
     return undefined;
 }
-function containsResource(root, resource) {
-    if (root.scheme !== resource.scheme) {
+function containsResource(root, resource, uriIdentityService) {
+    if (uriIdentityService.extUri.isEqual(root, resource,  true)) {
         return false;
     }
-    let resourceFsPath = normalize(resource.fsPath);
-    let rootPath = normalize(root.fsPath + (root.fsPath.endsWith(sep) ? "" : sep));
-    if (isUNC(root.fsPath) && isUNC(resource.fsPath)) {
-        rootPath = rootPath.toLowerCase();
-        resourceFsPath = resourceFsPath.toLowerCase();
+    if (root.scheme === Schemas.file && isUNC(root.fsPath)) {
+        if (resource.scheme === Schemas.file && isUNC(resource.fsPath)) {
+            return uriIdentityService.extUri.isEqualOrParent(resource.with({
+                path: resource.path.toLowerCase(),
+                authority: resource.authority.toLowerCase()
+            }), root.with({
+                path: root.path.toLowerCase(),
+                authority: root.authority.toLowerCase()
+            }),  true);
+        }
+        return false;
     }
-    return resourceFsPath.startsWith(rootPath);
+    return uriIdentityService.extUri.isEqualOrParent(resource, root,  true);
 }
 function normalizeResourcePath(resource) {
     if (resource.scheme === Schemas.vscodeRemote) {
@@ -110,4 +118,4 @@ function normalizeResourcePath(resource) {
     return resource;
 }
 
-export { WebviewResourceResponse, loadLocalResource };
+export { WebviewResourceResponse, getResourceToLoad, loadLocalResource };

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

@@ -17,6 +17,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { getSizeRegistry, sizeValueToCss } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/sizeUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/sizes/baseSizes';
 import { ColorScheme } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
 import { IWorkbenchThemeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 
@@ -63,6 +65,14 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
                 }
                 return colors;
             }, {});
+            const sizeRegistry = getSizeRegistry();
+            const exportedSizes = sizeRegistry.getSizes().reduce((sizes, entry) => {
+                const sizeValue = sizeRegistry.resolveDefaultSize(entry.id, theme);
+                if (sizeValue) {
+                    sizes["vscode-" + entry.id.replace(/\./g, "-")] = sizeValueToCss(sizeValue);
+                }
+                return sizes;
+            }, {});
             const styles = {
                 "vscode-font-family": DEFAULT_FONT_FAMILY,
                 "vscode-font-weight": "normal",
@@ -72,6 +82,7 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
                 "vscode-editor-font-size": editorFontSize + "px",
                 "text-link-decoration": linkUnderlines ? "underline" : "none",
                 ...exportedColors,
+                ...exportedSizes,
                 "vscode-editor-font-feature-settings": editorFontLigatures
             };
             const activeTheme = ApiThemeClassName.fromTheme(theme);

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

@@ -15,6 +15,7 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 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";
@@ -27,6 +28,7 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private readonly _remoteAuthorityResolverService;
     private readonly _tunnelService;
     private readonly _accessibilityService;
+    private readonly _uriIdentityService;
     protected readonly id: string;
     /**
      * The provided identifier of this webview.
@@ -66,7 +68,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);
+    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);
     dispose(): void;
     setContextKeyService(contextKeyService: IContextKeyService): void;
     private readonly _onMissingCsp;