@codingame/monaco-vscode-view-common-service-override 23.3.0 → 24.1.0

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

@@ -6,7 +6,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+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";
 /**
  * Webview that is absolutely positioned over another element and that can creates and destroys an underlying webview as needed.

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

@@ -8,7 +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 { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-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';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';

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

@@ -1,8 +1,8 @@
 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 { IWorkbenchColorTheme } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+import { IWorkbenchColorTheme } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IWorkbenchThemeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
-import { WebviewStyles } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewStyles } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 interface WebviewThemeData {
     readonly activeTheme: string;
     readonly themeLabel: string;

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

@@ -17,7 +17,7 @@ import { IRemoteAuthorityResolverService } from "@codingame/monaco-vscode-api/vs
 import { ITunnelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IWebviewElement, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebviewElement, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { WebviewFindDelegate, WebviewFindWidget } from "./webviewFindWidget.js";
 export declare class WebviewElement extends Disposable implements IWebviewElement, WebviewFindDelegate {
     protected readonly webviewThemeDataProvider: WebviewThemeDataProvider;

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

@@ -27,7 +27,7 @@ import { WebviewPortMappingManager } from '../../../../platform/webview/common/w
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/common/webview';
 import { loadLocalResource, WebviewResourceResponse } from './resourceLoading.js';
-import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { areWebviewContentOptionsEqual } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewFindWidget } from './webviewFindWidget.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
@@ -159,7 +159,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(12965, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(13105, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {
@@ -274,7 +274,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         element.name = this.id;
         element.className = `webview ${options.customClasses || ''}`;
         element.sandbox.add('allow-scripts', 'allow-same-origin', 'allow-forms', 'allow-pointer-lock', 'allow-downloads');
-        const allowRules = ['cross-origin-isolated', 'autoplay'];
+        const allowRules = ['cross-origin-isolated', 'autoplay', 'local-network-access'];
         if (!isFirefox) {
             allowRules.push('clipboard-read', 'clipboard-write');
         }

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

@@ -4,7 +4,7 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { SimpleFindWidget } from "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget";
+import { SimpleFindWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget";
 export interface WebviewFindDelegate {
     readonly hasFindResult: Event<boolean>;
     readonly onDidStopFind: Event<void>;

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

@@ -4,8 +4,8 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { SimpleFindWidget } from '@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { SimpleFindWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 
 let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
     async _getResultCount(dataChanged) {

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { WebviewThemeDataProvider } from "./themeing.js";
-import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview, IWebview, IWebviewElement, WebviewInitInfo } 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";
 export declare class WebviewService extends Disposable implements IWebviewService {
     protected readonly _instantiationService: IInstantiationService;

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

@@ -6,16 +6,16 @@ import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
-import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
+import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(12966, "Show find")); }
+    static { this.LABEL = ( localize(13106, "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(12967, "Stop find")); }
+    static { this.LABEL = ( localize(13107, "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(12968, 'Find next')); }
+    static { this.LABEL = ( localize(13108, '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(12969, 'Find previous')); }
+    static { this.LABEL = ( localize(13109, '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(12970, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(13110, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorSerializer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
-import { WebviewIcons, WebviewInput } from "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewIcons, WebviewInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 export type SerializedWebviewOptions = WebviewOptions & WebviewContentOptions;
 interface SerializedIconPath {

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
-import { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 
 let WebviewEditorInputSerializer = class WebviewEditorInputSerializer {

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

@@ -6,19 +6,19 @@ 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-api/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';
 import { ShowWebViewEditorFindWidgetAction, HideWebViewEditorFindCommand, WebViewEditorFindNextCommand, WebViewEditorFindPreviousCommand, ReloadWebviewAction } from './webviewCommands.js';
-import { WebviewEditor } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
-import { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { WebviewEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
+import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { WebviewEditorInputSerializer } from './webviewEditorInputSerializer.js';
-import '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
 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(12972, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(13112, "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,8 +7,8 @@ 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 { IViewletViewOptions } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+import { ViewPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewletViewOptions } from "@codingame/monaco-vscode-api/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";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.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-api/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-api/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-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore, WebviewContentPurpose } 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 { WebviewWindowDragMonitor } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
+import { WebviewWindowDragMonitor } from '@codingame/monaco-vscode-api/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-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-api/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';
@@ -87,7 +87,7 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
                 }, 0);
             }));
             this._register(toDisposable(() => {
-                this._resizeObserver.disconnect();
+                this._resizeObserver?.disconnect();
             }));
             this._resizeObserver.observe(container);
         }

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IViewBadge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
-import { IOverlayWebview } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IOverlayWebview } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service";
 /**
  * A webview shown in a view pane.

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-api/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

@@ -21,7 +21,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { findGroup } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/vscode/vs/workbench/services/editor/common/editorGroupFinder';
+import { findGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupFinder';
 import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { PauseableEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
@@ -450,8 +450,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(13685, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(13686, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(13827, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(13828, '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(13687, 'Keep {0}', editorName)),
+                label: ( localize(13829, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -498,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(13688, "Active"));
-        const currentDefaultLabel = ( localize(13689, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(13690, "Active and Default"));
+        const currentlyActiveLabel = ( localize(13830, "Active"));
+        const currentDefaultLabel = ( localize(13831, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(13832, "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(13691, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(13833, "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(13692, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(13693, "Select editor for '{0}'", basename(resource)));
+            ( localize(13834, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(13835, "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

@@ -9,7 +9,7 @@ import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperation, FileOperationEvent, FileChangeType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -26,7 +26,7 @@ import { WindowIdleValue, addDisposableListener, EventType, EventHelper } from '
 import { IWorkspacesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { ResourceGlobMatcher } from '@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/common/resources';
+import { ResourceGlobMatcher } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/resources';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -70,40 +70,40 @@ let HistoryService = class HistoryService extends Disposable {
         this.recentlyClosedEditors = [];
         this.ignoreEditorCloseEvent = false;
         this.history = undefined;
-        this.editorHistoryListeners = ( new Map());
+        this.editorHistoryListeners = this._register(( new DisposableMap()));
         this.resourceExcludeMatcher = this._register(( new WindowIdleValue(mainWindow, () => {
             const matcher = this._register(this.instantiationService.createInstance(ResourceGlobMatcher, root => getExcludes(root ? this.configurationService.getValue({ resource: root }) : this.configurationService.getValue()) || Object.create(null), event => event.affectsConfiguration(FILES_EXCLUDE_CONFIG) || event.affectsConfiguration(SEARCH_EXCLUDE_CONFIG)));
             this._register(matcher.onExpressionChange(() => this.removeExcludedFromHistory()));
             return matcher;
         })));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(13906, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(13907, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(14047, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(14048, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
-            13908,
+            14049,
             "Whether it is possible to navigate back in editor navigation locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
-            13909,
+            14050,
             "Whether it is possible to navigate forward in editor navigation locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
-            13910,
+            14051,
             "Whether it is possible to navigate to the last editor navigation location"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
-            13911,
+            14052,
             "Whether it is possible to navigate back in editor edit locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
-            13912,
+            14053,
             "Whether it is possible to navigate forward in editor edit locations history"
         ))))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
-            13913,
+            14054,
             "Whether it is possible to navigate to the last editor edit location"
         ))))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(13914, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(14055, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();
@@ -669,10 +669,7 @@ let HistoryService = class HistoryService extends Disposable {
     }
     clearRecentlyOpened() {
         this.history = [];
-        for (const [, disposable] of this.editorHistoryListeners) {
-            dispose(disposable);
-        }
-        this.editorHistoryListeners.clear();
+        this.editorHistoryListeners.clearAndDisposeAll();
     }
     getHistory() {
         this.ensureHistoryLoaded(this.history);
@@ -988,8 +985,8 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
         this.logService = logService;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.mapEditorToDisposable = ( new Map());
-        this.mapGroupToDisposable = ( new Map());
+        this.mapEditorToDisposable = this._register(( new DisposableMap()));
+        this.mapGroupToDisposable = this._register(( new DisposableMap()));
         this.stack = [];
         this.index = -1;
         this.previousIndex = -1;
@@ -1001,6 +998,9 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
     registerListeners() {
         this._register(this.onDidChange(() => this.traceStack()));
         this._register(this.logService.onDidChangeLogLevel(() => this.traceStack()));
+        this._register(this.editorGroupService.onDidRemoveGroup(group => {
+            this.mapGroupToDisposable.deleteAndDispose(group.id);
+        }));
     }
     traceStack() {
         if (this.logService.getLevel() !== LogLevel.Trace) {
@@ -1252,8 +1252,7 @@ ${entryLabels.join('\n')}
         this.index = this.stack.length - 1;
         this.previousIndex = -1;
         if (typeof arg1 === 'number') {
-            this.mapGroupToDisposable.get(arg1)?.dispose();
-            this.mapGroupToDisposable.delete(arg1);
+            this.mapGroupToDisposable.deleteAndDispose(arg1);
         }
         this._onDidChange.fire();
     }
@@ -1273,18 +1272,12 @@ ${entryLabels.join('\n')}
         this.index = -1;
         this.previousIndex = -1;
         this.stack.splice(0);
-        for (const [, disposable] of this.mapEditorToDisposable) {
-            dispose(disposable);
-        }
-        this.mapEditorToDisposable.clear();
-        for (const [, disposable] of this.mapGroupToDisposable) {
-            dispose(disposable);
-        }
-        this.mapGroupToDisposable.clear();
+        this.mapEditorToDisposable.clearAndDisposeAll();
+        this.mapGroupToDisposable.clearAndDisposeAll();
     }
     dispose() {
-        super.dispose();
         this.clear();
+        super.dispose();
     }
     canGoForward() {
         return this.stack.length > this.index + 1;
@@ -1497,11 +1490,7 @@ let EditorHelper = class EditorHelper {
         if (!isEditorInput(editor)) {
             return;
         }
-        const disposables = mapEditorToDispose.get(editor);
-        if (disposables) {
-            dispose(disposables);
-            mapEditorToDispose.delete(editor);
-        }
+        mapEditorToDispose.deleteAndDispose(editor);
     }
 };
 EditorHelper = ( __decorate([

package/vscode/src/vs/workbench/services/progress/browser/media/progressService.css

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-workbench .progress-badge > .badge-content::before {
-	mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;
-	-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;
-	width: 14px;
-	height: 14px;
+	mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTMiIGhlaWdodD0iMTMiIHZpZXdCb3g9IjAgMCAxMyAxMyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuNSA3QzQuNzc2IDcgNSA3LjIyNCA1IDcuNUM1IDcuNzc2IDQuNzc2IDggNC41IDhIMy45MDIzNEM0LjQzMTM2IDguOTEzOTEgNS40MTkwNiA5LjUgNi41IDkuNUM3LjQ4MSA5LjUgOC4zOTk5MSA5LjAxODg3IDguOTYxOTEgOC4yMTM4N0M5LjEyMDkyIDcuOTg1OTEgOS40MzMyMiA3LjkzMjg2IDkuNjU4MiA4LjA4OTg0QzkuODg1MTQgOC4yNDY4NSA5Ljk0MDE4IDguNTYwMTMgOS43ODIyMyA4Ljc4NzExQzkuMDM0MjMgOS44NTkxMSA3LjgwOCAxMC41IDYuNSAxMC41QzUuMDM0MTQgMTAuNSAzLjY5NzA2IDkuNjkzMjcgMyA4LjQzODQ4VjkuNUMzIDkuNzc2IDIuNzc2IDEwIDIuNSAxMEMyLjIyNCAxMCAyIDkuNzc2IDIgOS41VjcuNUMyIDcuMjI0IDIuMjI0IDcgMi41IDdINC41WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTYuNSAyLjVDNy45NjU4NSAyLjUgOS4zMDI5NCAzLjMwNjc0IDEwIDQuNTYxNTJWMy41QzEwIDMuMjI0MDEgMTAuMjI0IDMuMDAwMDIgMTAuNSAzQzEwLjc3NiAzIDExIDMuMjIzMDIgMTEgMy40OTkwMlY1LjQ5OTAyQzExIDUuNzc1MDEgMTAuNzc2IDUuOTk5MDIgMTAuNSA1Ljk5OTAySDguNUM4LjIyNDAzIDUuOTk5IDguMDAwMDEgNS43NzUgOCA1LjQ5OTAyQzggNS4yMjMwNCA4LjIyNDAyIDQuOTk5MDUgOC41IDQuOTk5MDJIOS4wOTc2NkM4LjU2ODYzIDQuMDg1MTEgNy41ODA5NCAzLjQ5OTAyIDYuNSAzLjQ5OTAyQzUuNTE5MDIgMy40OTkwNCA0LjYwMDA4IDMuOTgwMTcgNC4wMzgwOSA0Ljc4NTE2QzMuODc5MDcgNS4wMTIwOCAzLjU2NTc3IDUuMDY1MTYgMy4zNDE4IDQuOTA5MThDMy4xMTQ4OCA0Ljc1MjE3IDMuMDU5ODQgNC40Mzk4NiAzLjIxNzc3IDQuMjEyODlDMy45NjU3NyAzLjE0MDkgNS4xOTIwMiAyLjUwMDAxIDYuNSAyLjVaIiBmaWxsPSJjdXJyZW50Q29sb3IiLz4KPC9zdmc+Cg==") no-repeat;
+	-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTMiIGhlaWdodD0iMTMiIHZpZXdCb3g9IjAgMCAxMyAxMyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuNSA3QzQuNzc2IDcgNSA3LjIyNCA1IDcuNUM1IDcuNzc2IDQuNzc2IDggNC41IDhIMy45MDIzNEM0LjQzMTM2IDguOTEzOTEgNS40MTkwNiA5LjUgNi41IDkuNUM3LjQ4MSA5LjUgOC4zOTk5MSA5LjAxODg3IDguOTYxOTEgOC4yMTM4N0M5LjEyMDkyIDcuOTg1OTEgOS40MzMyMiA3LjkzMjg2IDkuNjU4MiA4LjA4OTg0QzkuODg1MTQgOC4yNDY4NSA5Ljk0MDE4IDguNTYwMTMgOS43ODIyMyA4Ljc4NzExQzkuMDM0MjMgOS44NTkxMSA3LjgwOCAxMC41IDYuNSAxMC41QzUuMDM0MTQgMTAuNSAzLjY5NzA2IDkuNjkzMjcgMyA4LjQzODQ4VjkuNUMzIDkuNzc2IDIuNzc2IDEwIDIuNSAxMEMyLjIyNCAxMCAyIDkuNzc2IDIgOS41VjcuNUMyIDcuMjI0IDIuMjI0IDcgMi41IDdINC41WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTYuNSAyLjVDNy45NjU4NSAyLjUgOS4zMDI5NCAzLjMwNjc0IDEwIDQuNTYxNTJWMy41QzEwIDMuMjI0MDEgMTAuMjI0IDMuMDAwMDIgMTAuNSAzQzEwLjc3NiAzIDExIDMuMjIzMDIgMTEgMy40OTkwMlY1LjQ5OTAyQzExIDUuNzc1MDEgMTAuNzc2IDUuOTk5MDIgMTAuNSA1Ljk5OTAySDguNUM4LjIyNDAzIDUuOTk5IDguMDAwMDEgNS43NzUgOCA1LjQ5OTAyQzggNS4yMjMwNCA4LjIyNDAyIDQuOTk5MDUgOC41IDQuOTk5MDJIOS4wOTc2NkM4LjU2ODYzIDQuMDg1MTEgNy41ODA5NCAzLjQ5OTAyIDYuNSAzLjQ5OTAyQzUuNTE5MDIgMy40OTkwNCA0LjYwMDA4IDMuOTgwMTcgNC4wMzgwOSA0Ljc4NTE2QzMuODc5MDcgNS4wMTIwOCAzLjU2NTc3IDUuMDY1MTYgMy4zNDE4IDQuOTA5MThDMy4xMTQ4OCA0Ljc1MjE3IDMuMDU5ODQgNC40Mzk4NiAzLjIxNzc3IDQuMjEyODlDMy45NjU3NyAzLjE0MDkgNS4xOTIwMiAyLjUwMDAxIDYuNSAyLjVaIiBmaWxsPSJjdXJyZW50Q29sb3IiLz4KPC9zdmc+Cg==") no-repeat;
+	width: 13px;
+	height: 13px;
 	position: absolute;
 	top: 0;
 	right: 0;

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-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/activity/common/activity';
+import { ProgressBadge } from '@codingame/monaco-vscode-api/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';
@@ -17,7 +17,7 @@ import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actio
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
-import { Dialog } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
+import { Dialog } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { parseLinkedText } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedText';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
@@ -26,7 +26,7 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IUserActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
-import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/platform/dialogs/browser/dialog';
+import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/dialog';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 registerCss(progressService);
@@ -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(14041, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(14042, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(14182, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(14183, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(14043, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(14184, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(14043, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(14184, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(14044, "Progress Message")),
+                name: ( localize(14185, "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(14045, "Cancel")), undefined, true);
+                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(14186, "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(14045, "Cancel")) : options.cancellable)
-                    : ( localize(14046, "Dismiss")));
+                    ? (typeof options.cancellable === 'boolean' ? ( localize(14186, "Cancel")) : options.cancellable)
+                    : ( localize(14187, "Dismiss")));
             }
             dialog = ( new Dialog(
                 this.layoutService.activeContainer,