@codingame/monaco-vscode-view-common-service-override 21.6.0 → 22.0.0

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(9357, "Keyboard Layout"));
+        const name = ( localize(9447, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9358, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9448, "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(9358, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9448, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9358, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9448, "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(
-        9359,
+        9449,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9360,
+        9450,
         '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(9361, "Change Keyboard Layout")),
+            title: ( localize2(9451, "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(9362, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9452, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9363, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9453, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9364, "Auto Detect")),
+            label: ( localize(9454, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9365, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9455, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9366, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9456, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -1,16 +1,14 @@
 
+import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
-import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { workbenchConfigurationNodeBase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
-import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { SashSettingsController } from './sash.js';
-import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
-( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(SashSettingsController, LifecyclePhase.Restored);
-( Registry.as(Extensions$1.Configuration))
+registerWorkbenchContribution2(SashSettingsController.ID, SashSettingsController, WorkbenchPhase.AfterRestored);
+( Registry.as(Extensions.Configuration))
     .registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
@@ -20,7 +18,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                9889,
+                9979,
                 "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 +28,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                9890,
+                9980,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

package/vscode/src/vs/workbench/contrib/sash/browser/sash.d.ts

@@ -1,15 +1,13 @@
-import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 export declare const minSize = 1;
 export declare const maxSize = 20;
-export declare class SashSettingsController implements IWorkbenchContribution, IDisposable {
+export declare class SashSettingsController extends Disposable implements IWorkbenchContribution {
     private readonly configurationService;
-    private readonly layoutService;
-    private readonly disposables;
-    constructor(configurationService: IConfigurationService, layoutService: ILayoutService);
+    static readonly ID = "workbench.contrib.sash";
+    private readonly styleSheet;
+    constructor(configurationService: IConfigurationService);
     private onDidChangeSize;
     private onDidChangeHoverDelay;
-    dispose(): void;
 }

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

@@ -3,40 +3,41 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { setGlobalSashSize, setGlobalHoverDelay } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
+import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 
-let SashSettingsController = class SashSettingsController {
-    constructor(configurationService, layoutService) {
+let SashSettingsController = class SashSettingsController extends Disposable {
+    static { this.ID = 'workbench.contrib.sash'; }
+    constructor(configurationService) {
+        super();
         this.configurationService = configurationService;
-        this.layoutService = layoutService;
-        this.disposables = ( new DisposableStore());
+        this.styleSheet = createStyleSheet();
         const onDidChangeSize = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sash.size'));
-        onDidChangeSize(this.onDidChangeSize, this, this.disposables);
+        onDidChangeSize(this.onDidChangeSize, this, this._store);
         this.onDidChangeSize();
         const onDidChangeHoverDelay = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sash.hoverDelay'));
-        onDidChangeHoverDelay(this.onDidChangeHoverDelay, this, this.disposables);
+        onDidChangeHoverDelay(this.onDidChangeHoverDelay, this, this._store);
         this.onDidChangeHoverDelay();
     }
     onDidChangeSize() {
         const configuredSize = this.configurationService.getValue('workbench.sash.size');
         const size = clamp(configuredSize, 4, 20);
         const hoverSize = clamp(configuredSize, 1, 8);
-        this.layoutService.mainContainer.style.setProperty('--vscode-sash-size', size + 'px');
-        this.layoutService.mainContainer.style.setProperty('--vscode-sash-hover-size', hoverSize + 'px');
+        this.styleSheet.textContent = `
+			.monaco-workbench {
+				--vscode-sash-size: ${size}px;
+				--vscode-sash-hover-size: ${hoverSize}px;
+			}
+		`;
         setGlobalSashSize(size);
     }
     onDidChangeHoverDelay() {
         setGlobalHoverDelay(this.configurationService.getValue('workbench.sash.hoverDelay'));
     }
-    dispose() {
-        this.disposables.dispose();
-    }
 };
 SashSettingsController = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, ILayoutService))
+    ( __param(0, IConfigurationService))
 ], SashSettingsController));
 
 export { SashSettingsController };

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

@@ -117,8 +117,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(10101, 'Scrolling Locked'));
-                const tooltip = ( localize(10102, 'Lock Scrolling Enabled'));
+                const text = ( localize(10192, 'Scrolling Locked'));
+                const tooltip = ( localize(10193, 'Lock Scrolling Enabled'));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -144,13 +144,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.toggleLockedScrolling',
                     title: {
-                        ...( localize2(10103, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10104, "Locked Scrolling")),
+                        ...( localize2(10194, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10195, "Locked Scrolling")),
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(10105, "Synchronize Scrolling Editors")),
+                        description: ( localize(10196, "Synchronize Scrolling Editors")),
                     }
                 });
             }
@@ -163,8 +163,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.holdLockedScrolling',
                     title: {
-                        ...( localize2(10106, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10107, "Locked Scrolling")),
+                        ...( localize2(10197, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10198, "Locked Scrolling")),
                     },
                     category: Categories.View,
                 });

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(12197, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12198, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12314, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12315, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(12199, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(12316, '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(12200, "No results")));
+                this._widget.showMessage(( localize(12317, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(12201, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(12318, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(12202, 'Peek Type Hierarchy')),
+            title: ( localize2(12319, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(12203, 'Show Supertypes')),
+            title: ( localize2(12320, '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(12204, 'Show Subtypes')),
+            title: ( localize2(12321, '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(12205, 'Refocus Type Hierarchy')),
+            title: ( localize2(12322, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(12206, 'Close')),
+            title: ( localize(12323, '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(12207, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(12208, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(12324, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(12325, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(12209, "Loading...")));
+        this.setTitle(( localize(12326, "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(12210, "No supertypes of '{0}'", model.root.name))
-                : ( localize(12211, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(12327, "No supertypes of '{0}'", model.root.name))
+                : ( localize(12328, "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(12212, "Type Hierarchy");
+        return localize(12329, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(12213, "supertypes of {0}", element.item.name);
+            return localize(12330, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(12214, "subtypes of {0}", element.item.name);
+            return localize(12331, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -1,15 +1,15 @@
 
 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, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+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 { 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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -59,7 +59,8 @@ let WebviewElement = class WebviewElement extends Disposable {
         if (!this.window) {
             return false;
         }
-        if (this.window.document.activeElement && this.window.document.activeElement !== this.element) {
+        const activeElement = getActiveElement(this.window.document);
+        if (activeElement && activeElement !== this.element) {
             return false;
         }
         return true;
@@ -158,7 +159,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(12514, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(12631, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -623,8 +624,11 @@ let WebviewElement = class WebviewElement extends Disposable {
             if (!this.isFocused || !this.element) {
                 return;
             }
-            if (this.window?.document.activeElement && this.window.document.activeElement !== this.element && this.window.document.activeElement?.tagName !== 'BODY') {
-                return;
+            if (this.window) {
+                const activeElement = getActiveElement(this.window?.document);
+                if (activeElement && activeElement !== this.element && activeElement?.tagName !== 'BODY') {
+                    return;
+                }
             }
             this.window?.document.body?.focus();
             this._send('focus', undefined);

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

@@ -15,7 +15,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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(12515, "Show find")); }
+    static { this.LABEL = ( localize(12632, "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(12516, "Stop find")); }
+    static { this.LABEL = ( localize(12633, "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(12517, 'Find next')); }
+    static { this.LABEL = ( localize(12634, '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(12518, 'Find previous')); }
+    static { this.LABEL = ( localize(12635, '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(12519, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(12636, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -6,7 +6,7 @@ import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
@@ -18,7 +18,7 @@ import '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vsc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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(12521, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(12638, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {

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

@@ -7,7 +7,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { ViewPane } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewletViewOptions } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
 import { IViewBadge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";

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

@@ -15,15 +15,15 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/common/memento';
+import { ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ExtensionKeyedWebviewOriginStore, WebviewContentPurpose } 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 { WebviewWindowDragMonitor } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
 import { IWebviewViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service';
-import { NumberBadge } from '@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';

package/vscode/src/vs/workbench/services/editor/browser/editorPaneService.js

@@ -1,6 +1,6 @@
 
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 
 class EditorPaneService {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -450,8 +450,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(13216, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(13217, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(13347, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(13348, 'Configure Default')),
                 run: async () => {
                     const picked = await this.doPickEditor(untypedInput, true);
                     if (!picked) {
@@ -472,7 +472,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }
             },
             {
-                label: ( localize(13218, 'Keep {0}', editorName)),
+                label: ( localize(13349, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -498,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(13219, "Active"));
-        const currentDefaultLabel = ( localize(13220, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(13221, "Active and Default"));
+        const currentlyActiveLabel = ( localize(13350, "Active"));
+        const currentDefaultLabel = ( localize(13351, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(13352, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -525,7 +525,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(13222, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(13353, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -540,8 +540,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const disposables = ( new DisposableStore());
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         const placeHolderMessage = showDefaultPicker ?
-            ( localize(13223, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(13224, "Select editor for '{0}'", basename(resource)));
+            ( localize(13354, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(13355, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;