@codingame/monaco-vscode-view-common-service-override 20.5.0 → 21.0.1

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

@@ -63,9 +63,9 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
                 'vscode-editor-font-family': editorFontFamily,
                 'vscode-editor-font-weight': editorFontWeight,
                 'vscode-editor-font-size': editorFontSize + 'px',
-                'vscode-editor-font-feature-settings': editorFontLigatures,
                 'text-link-decoration': linkUnderlines ? 'underline' : 'none',
-                ...exportedColors
+                ...exportedColors,
+                'vscode-editor-font-feature-settings': editorFontLigatures,
             };
             const activeTheme = ApiThemeClassName.fromTheme(theme);
             this._cachedWebViewThemeData = { styles, activeTheme, themeLabel: theme.label, themeId: theme.settingsId };

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

@@ -17,9 +17,9 @@ 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-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebviewElement, 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 {
+export declare class WebviewElement extends Disposable implements IWebviewElement, WebviewFindDelegate {
     protected readonly webviewThemeDataProvider: WebviewThemeDataProvider;
     private readonly _environmentService;
     private readonly _fileService;
@@ -99,6 +99,7 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     private _initElement;
     mountTo(element: HTMLElement, targetWindow: CodeWindow): void;
     private _registerMessageHandler;
+    private perfMark;
     private _startBlockingIframeDragEvents;
     private _stopBlockingIframeDragEvents;
     protected webviewContentEndpoint(encodedWebviewOrigin: string): string;

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

@@ -158,7 +158,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(12282, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(12501, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -310,8 +310,8 @@ let WebviewElement = class WebviewElement extends Disposable {
         params.fakeHtmlUri = ( ( FileAccess.asBrowserUri('vs/workbench/contrib/webview/browser/pre/fake.html')).toString(true));
         COI.addSearchParam(params, true, true);
         const queryString = ( ( new URLSearchParams(params)).toString());
-        const fileName = isFirefox ? 'index-no-csp.html' : 'index.html';
-        const relativeIframeSrc = ( FileAccess.asBrowserUri(`vs/workbench/contrib/webview/browser/pre/${fileName}`));
+        this.perfMark('init/set-src');
+        const relativeIframeSrc = ( FileAccess.asBrowserUri(`vs/workbench/contrib/webview/browser/pre/index.html`));
         this.element.setAttribute('src', `${( relativeIframeSrc.toString(true))}?${queryString}`);
     }
     mountTo(element, targetWindow) {
@@ -340,6 +340,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             }));
         }
         element.id = this.id;
+        this.perfMark('mounted');
         element.appendChild(this.element);
     }
     _registerMessageHandler(targetWindow) {
@@ -351,7 +352,8 @@ let WebviewElement = class WebviewElement extends Disposable {
                 if (this._messagePort) {
                     return;
                 }
-                this._logService.debug(`Webview(${this.id}): webview ready`);
+                this.perfMark('webview-ready');
+                this._logService.trace(`Webview(${this.id}): webview ready`);
                 this._messagePort = e.ports[0];
                 this._messagePort.onmessage = (e) => {
                     const handlers = this._messageHandlers.get(e.data.channel);
@@ -370,6 +372,13 @@ let WebviewElement = class WebviewElement extends Disposable {
             }
         }));
     }
+    perfMark(name) {
+        performance.mark(`webview/webviewElement/${name}`, {
+            detail: {
+                id: this.id
+            }
+        });
+    }
     _startBlockingIframeDragEvents() {
         if (this.element) {
             this.element.style.pointerEvents = 'none';
@@ -463,6 +472,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._logService.debug(`Webview(${this.id}): will update content`);
         this._content = newContent;
         const allowScripts = !!this._content.options.allowScripts;
+        this.perfMark('set-content');
         this._send('content', {
             contents: this._content.html,
             title: this._content.title,

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(12283, "Show find")); }
+    static { this.LABEL = ( localize(12502, "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(12284, "Stop find")); }
+    static { this.LABEL = ( localize(12503, "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(12285, 'Find next')); }
+    static { this.LABEL = ( localize(12504, '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(12286, 'Find previous')); }
+    static { this.LABEL = ( localize(12505, '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(12287, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(12506, "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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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(12289, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(12508, "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-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-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-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 { 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 { 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-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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(13005, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(13006, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(13203, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(13204, '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(13007, 'Keep {0}', editorName)),
+                label: ( localize(13205, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -498,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(13008, "Active"));
-        const currentDefaultLabel = ( localize(13009, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(13010, "Active and Default"));
+        const currentlyActiveLabel = ( localize(13206, "Active"));
+        const currentDefaultLabel = ( localize(13207, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(13208, "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(13011, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(13209, "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(13012, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(13013, "Select editor for '{0}'", basename(resource)));
+            ( localize(13210, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(13211, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -77,33 +77,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         })));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(13225, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(13226, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(13424, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(13425, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
-            13227,
+            13426,
             "Whether it is possible to navigate back in editor navigation locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
-            13228,
+            13427,
             "Whether it is possible to navigate forward in editor navigation locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
-            13229,
+            13428,
             "Whether it is possible to navigate to the last editor navigation location"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
-            13230,
+            13429,
             "Whether it is possible to navigate back in editor edit locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
-            13231,
+            13430,
             "Whether it is possible to navigate forward in editor edit locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
-            13232,
+            13431,
             "Whether it is possible to navigate to the last editor edit location"
         ))))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(13233, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(13432, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -9,7 +9,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { timeout, DeferredPromise, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ProgressBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { NotificationPriority, NotificationsFilter, isNotificationSource } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
@@ -132,23 +132,23 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(13360, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(13361, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(13559, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(13560, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(13362, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(13561, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(13362, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(13561, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(13363, "Progress Message")),
+                name: ( localize(13562, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -244,7 +244,7 @@ let ProgressService = class ProgressService extends Disposable {
             if (options.cancellable) {
                 const cancelAction = new (class extends Action {
                     constructor() {
-                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(13364, "Cancel")), undefined, true);
+                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(13563, "Cancel")), undefined, true);
                     }
                     async run() {
                         progressStateModel.cancel();
@@ -422,8 +422,8 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(options.cancellable
-                    ? (typeof options.cancellable === 'boolean' ? ( localize(13364, "Cancel")) : options.cancellable)
-                    : ( localize(13365, "Dismiss")));
+                    ? (typeof options.cancellable === 'boolean' ? ( localize(13563, "Cancel")) : options.cancellable)
+                    : ( localize(13564, "Dismiss")));
             }
             dialog = ( new Dialog(
                 this.layoutService.activeContainer,

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -9,7 +9,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from '@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 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 { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -346,7 +346,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         const container = this.viewContainersRegistry.registerViewContainer({
             id,
             ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }])),
-            title: { value: ( localize(13730, "User View Container")), original: 'User View Container' },
+            title: { value: ( localize(13929, "User View Container")), original: 'User View Container' },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
             storageId: getViewContainerStorageId(id),
             hideIfEmpty: true
@@ -560,7 +560,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    13731,
+                                    13930,
                                     'Toggles the visibility of the {0} view if the view container it is located in is visible',
                                     viewDescriptor.name.value
                                 ))
@@ -591,10 +591,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(13732, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(13931, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    13733,
+                                    13932,
                                     'Hides the {0} view if it is visible and the view container it is located in is visible',
                                     viewDescriptor.name.value
                                 ))
@@ -624,7 +624,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(13734, "Reset Location")),
+                    title: ( localize2(13933, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewContainerTitleContext,
                             group: '1_viewActions',