@codingame/monaco-vscode-view-common-service-override 15.0.2 → 16.0.0

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

@@ -105,14 +105,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(10744, "Type Hierarchy");
+        return localize(11066, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(10745, "supertypes of {0}", element.item.name);
+            return localize(11067, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(10746, "subtypes of {0}", element.item.name);
+            return localize(11068, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -37,7 +37,7 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     get isFocused(): boolean;
     private _isDisposed;
     private readonly _onDidDispose;
-    onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    readonly onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     dispose(): void;
     get container(): HTMLElement;
     claim(owner: any, targetWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;

package/{assets → vscode/src/vs/workbench/contrib/webview/browser/pre}/service-worker.js

@@ -18,6 +18,8 @@ const searchParams = new URL(location.toString()).searchParams;
 
 const remoteAuthority = searchParams.get('remoteAuthority');
 
+const ID = searchParams.get('id');
+
 /**
  * Origin used for resources
  */
@@ -233,12 +235,19 @@ sw.addEventListener('activate', (event) => {
  */
 async function processResourceRequest(event, requestUrlComponents) {
 	const client = await sw.clients.get(event.clientId);
+	let webviewId;
 	if (!client) {
-		console.error('Could not find inner client for request');
-		return notFound();
+		const workerClient = await getWorkerClientForId(event.clientId);
+		if (!workerClient) {
+			console.error('Could not find inner client for request');
+			return notFound();
+		} else {
+			webviewId = getWebviewIdForClient(workerClient);
+		}
+	} else {
+		webviewId = getWebviewIdForClient(client);
 	}
 
-	const webviewId = getWebviewIdForClient(client);
 	if (!webviewId) {
 		console.error('Could not resolve webview id');
 		return notFound();
@@ -439,6 +448,15 @@ async function processLocalhostRequest(event, requestUrl) {
  * @returns {string | null}
  */
 function getWebviewIdForClient(client) {
+	// Refs https://github.com/microsoft/vscode/issues/244143
+	// With PlzDedicatedWorker, worker subresources and blob wokers
+	// will use clients different from the window client.
+	// Since we cannot different a worker main resource from a worker subresource
+	// we will use the global webview ID passed in at the time of
+	// service worker registration.
+	if (client.type === 'worker' || client.type === 'sharedworker') {
+		return ID;
+	}
 	const requesterClientUrl = new URL(client.url);
 	return requesterClientUrl.searchParams.get('id');
 }
@@ -454,3 +472,16 @@ async function getOuterIframeClient(webviewId) {
 		return clientUrl.searchParams.get('id') === webviewId;
 	});
 }
+
+/**
+ * @param {string} clientId
+ * @returns {Promise<Client|undefined>}
+ */
+async function getWorkerClientForId(clientId) {
+	const allDedicatedWorkerClients = await sw.clients.matchAll({ type: 'worker' });
+	const allSharedWorkerClients = await sw.clients.matchAll({ type: 'sharedworker' });
+	const allWorkerClients = [...allDedicatedWorkerClients, ...allSharedWorkerClients];
+	return allWorkerClients.find(client => {
+		return client.id === clientId;
+	});
+}

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

@@ -157,7 +157,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(11045, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(11367, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {

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-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget";
+import { SimpleFindWidget } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/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,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-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
+import { SimpleFindWidget } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/webview/browser/webview';
 
 let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {

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(11046, "Show find")); }
+    static { this.LABEL = ( localize(11368, "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(11047, "Stop find")); }
+    static { this.LABEL = ( localize(11369, "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(11048, 'Find next')); }
+    static { this.LABEL = ( localize(11370, '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(11049, 'Find previous')); }
+    static { this.LABEL = ( localize(11371, '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(11050, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(11372, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -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(11052, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
+(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(11374, "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

@@ -8,7 +8,7 @@ import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 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-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
-import { IViewletViewOptions } from "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common/vscode/vs/workbench/browser/parts/views/viewsViewlet";
+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";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.d.ts

@@ -8,7 +8,6 @@ import { RegisteredEditorInfo, RegisteredEditorOptions, EditorAssociations, Reso
 import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 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";
@@ -20,7 +19,6 @@ export declare class EditorResolverService extends Disposable implements IEditor
     private readonly configurationService;
     private readonly quickInputService;
     private readonly notificationService;
-    private readonly telemetryService;
     private readonly storageService;
     private readonly extensionService;
     private readonly logService;
@@ -34,7 +32,7 @@ export declare class EditorResolverService extends Disposable implements IEditor
     private _flattenedEditors;
     private _shouldReFlattenEditors;
     private cache;
-    constructor(editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, configurationService: IConfigurationService, quickInputService: IQuickInputService, notificationService: INotificationService, telemetryService: ITelemetryService, storageService: IStorageService, extensionService: IExtensionService, logService: ILogService);
+    constructor(editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, configurationService: IConfigurationService, quickInputService: IQuickInputService, notificationService: INotificationService, storageService: IStorageService, extensionService: IExtensionService, logService: ILogService);
     private resolveUntypedInputAndGroup;
     resolveEditor(editor: IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<ResolvedEditor>;
     private doResolveSideBySideEditor;
@@ -54,7 +52,6 @@ export declare class EditorResolverService extends Disposable implements IEditor
     private doHandleConflictingDefaults;
     private mapEditorsToQuickPickEntry;
     private doPickEditor;
-    private sendEditorResolutionTelemetry;
     private cacheEditors;
     private resourceMatchesCache;
 }

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

@@ -16,7 +16,6 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 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';
@@ -33,14 +32,13 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     static { this.configureDefaultID = 'promptOpenWith.configureDefault'; }
     static { this.cacheStorageID = 'editorOverrideService.cache'; }
     static { this.conflictingDefaultsStorageID = 'editorOverrideService.conflictingDefaults'; }
-    constructor(editorGroupService, instantiationService, configurationService, quickInputService, notificationService, telemetryService, storageService, extensionService, logService) {
+    constructor(editorGroupService, instantiationService, configurationService, quickInputService, notificationService, storageService, extensionService, logService) {
         super();
         this.editorGroupService = editorGroupService;
         this.instantiationService = instantiationService;
         this.configurationService = configurationService;
         this.quickInputService = quickInputService;
         this.notificationService = notificationService;
-        this.telemetryService = telemetryService;
         this.storageService = storageService;
         this.extensionService = extensionService;
         this.logService = logService;
@@ -144,7 +142,6 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             await this.doHandleConflictingDefaults(resource, selectedEditor.editorInfo.label, untypedEditor, input.editor, group);
         }
         if (input) {
-            this.sendEditorResolutionTelemetry(input.editor);
             if (input.editor.editorId !== selectedEditor.editorInfo.id) {
                 this.logService.warn(`Editor ID Mismatch: ${input.editor.editorId} !== ${selectedEditor.editorInfo.id}. This will cause bugs. Please ensure editorInput.editorId matches the registered id`);
             }
@@ -449,8 +446,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(11722, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(11723, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(12053, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(12054, 'Configure Default')),
                 run: async () => {
                     const picked = await this.doPickEditor(untypedInput, true);
                     if (!picked) {
@@ -471,7 +468,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }
             },
             {
-                label: ( localize(11724, 'Keep {0}', editorName)),
+                label: ( localize(12055, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -497,9 +494,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(11725, "Active"));
-        const currentDefaultLabel = ( localize(11726, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(11727, "Active and Default"));
+        const currentlyActiveLabel = ( localize(12056, "Active"));
+        const currentDefaultLabel = ( localize(12057, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(12058, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -524,7 +521,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(11728, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(12059, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -539,8 +536,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const disposables = ( new DisposableStore());
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         const placeHolderMessage = showDefaultPicker ?
-            ( localize(11729, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(11730, "Select editor for '{0}'", basename(resource)));
+            ( localize(12060, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(12061, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;
@@ -589,11 +586,6 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         }
         return undefined;
     }
-    sendEditorResolutionTelemetry(chosenInput) {
-        if (chosenInput.editorId) {
-            this.telemetryService.publicLog2('override.viewType', { viewType: chosenInput.editorId });
-        }
-    }
     cacheEditors() {
         const cacheStorage = ( new Set());
         for (const [globPattern, contribPoint] of this._flattenedEditors) {
@@ -634,10 +626,9 @@ EditorResolverService = EditorResolverService_1 = ( __decorate([
     ( __param(2, IConfigurationService)),
     ( __param(3, IQuickInputService)),
     ( __param(4, INotificationService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, IExtensionService)),
-    ( __param(8, ILogService))
+    ( __param(5, IStorageService)),
+    ( __param(6, IExtensionService)),
+    ( __param(7, ILogService))
 ], EditorResolverService));
 
 export { EditorResolverService };

package/vscode/src/vs/workbench/services/history/browser/historyService.d.ts

@@ -131,7 +131,6 @@ interface IEditorNavigationStackEntry {
 export declare class EditorNavigationStack extends Disposable {
     private readonly filter;
     private readonly scope;
-    private readonly instantiationService;
     private readonly editorService;
     private readonly editorGroupService;
     private readonly logService;

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

@@ -55,34 +55,6 @@ let HistoryService = class HistoryService extends Disposable {
         this.logService = logService;
         this.activeEditorListeners = this._register(( new DisposableStore()));
         this.lastActiveEditor = undefined;
-        this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(11937, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(11938, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
-        this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
-            11939,
-            "Whether it is possible to navigate back in editor navigation locations history"
-        ))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
-            11940,
-            "Whether it is possible to navigate forward in editor navigation locations history"
-        ))))).bindTo(this.contextKeyService);
-        this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
-            11941,
-            "Whether it is possible to navigate to the last editor navigation location"
-        ))))).bindTo(this.contextKeyService);
-        this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
-            11942,
-            "Whether it is possible to navigate back in editor edit locations history"
-        ))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
-            11943,
-            "Whether it is possible to navigate forward in editor edit locations history"
-        ))))).bindTo(this.contextKeyService);
-        this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
-            11944,
-            "Whether it is possible to navigate to the last editor edit location"
-        ))))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(11945, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
         this._onDidChangeEditorNavigationStack = this._register(( new Emitter()));
         this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
         this.defaultScopedEditorNavigationStack = undefined;
@@ -104,6 +76,34 @@ let HistoryService = class HistoryService extends Disposable {
             this._register(matcher.onExpressionChange(() => this.removeExcludedFromHistory()));
             return matcher;
         })));
+        this.editorHelper = this.instantiationService.createInstance(EditorHelper);
+        this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(12270, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(12271, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
+        this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
+            12272,
+            "Whether it is possible to navigate back in editor navigation locations history"
+        ))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
+            12273,
+            "Whether it is possible to navigate forward in editor navigation locations history"
+        ))))).bindTo(this.contextKeyService);
+        this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
+            12274,
+            "Whether it is possible to navigate to the last editor navigation location"
+        ))))).bindTo(this.contextKeyService);
+        this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
+            12275,
+            "Whether it is possible to navigate back in editor edit locations history"
+        ))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
+            12276,
+            "Whether it is possible to navigate forward in editor edit locations history"
+        ))))).bindTo(this.contextKeyService);
+        this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
+            12277,
+            "Whether it is possible to navigate to the last editor edit location"
+        ))))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(12278, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();
@@ -983,7 +983,6 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
         super();
         this.filter = filter;
         this.scope = scope;
-        this.instantiationService = instantiationService;
         this.editorService = editorService;
         this.editorGroupService = editorGroupService;
         this.logService = logService;
@@ -991,12 +990,12 @@ let EditorNavigationStack = class EditorNavigationStack extends Disposable {
         this.onDidChange = this._onDidChange.event;
         this.mapEditorToDisposable = ( new Map());
         this.mapGroupToDisposable = ( new Map());
-        this.editorHelper = this.instantiationService.createInstance(EditorHelper);
         this.stack = [];
         this.index = -1;
         this.previousIndex = -1;
         this.navigating = false;
         this.currentSelectionState = undefined;
+        this.editorHelper = instantiationService.createInstance(EditorHelper);
         this.registerListeners();
     }
     registerListeners() {

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

@@ -0,0 +1,15 @@
+.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;
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	margin: auto;
+	background-color: currentColor;
+	content: '';
+	background-repeat: no-repeat;
+}

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import './media/progressService.css.js';
+import './media/progressService.css';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Disposable, toDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ProgressLocation, Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
@@ -16,18 +16,16 @@ 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-44b92f80-48ea-5562-a8d0-18a015f8d845-common/vscode/vs/base/browser/ui/dialog/dialog';
+import { Dialog } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { parseLinkedText } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedText';
 import { ViewContainerLocation } 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';
 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 { defaultDialogStyles, defaultInputBoxStyles, defaultCheckboxStyles, defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { ResultKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingResolver';
 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 Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let ProgressService = class ProgressService extends Disposable {
@@ -132,23 +130,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(12068, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(12069, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(12401, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(12402, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             }
             else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(12070, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(12403, "[{0}]: {1}", source, progressTitle)) : text;
             }
             else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(12070, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(12403, "[{0}]: {1}", source, progressMessage)) : text;
             }
             else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(12071, "Progress Message")),
+                name: ( localize(12404, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -244,7 +242,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(12072, "Cancel")), undefined, true);
+                        super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(12405, "Cancel")), undefined, true);
                     }
                     async run() {
                         progressStateModel.cancel();
@@ -416,44 +414,32 @@ let ProgressService = class ProgressService extends Disposable {
     }
     withDialogProgress(options, task, onDidCancel) {
         const disposables = ( new DisposableStore());
-        const allowableCommands = [
-            'workbench.action.quit',
-            'workbench.action.reloadWindow',
-            'copy',
-            'cut',
-            'editor.action.clipboardCopyAction',
-            'editor.action.clipboardCutAction'
-        ];
         let dialog;
+        let taskCompleted = false;
         const createDialog = (message) => {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(options.cancellable
-                    ? (typeof options.cancellable === 'boolean' ? ( localize(12072, "Cancel")) : options.cancellable)
-                    : ( localize(12073, "Dismiss")));
-            }
-            dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
-                type: 'pending',
-                detail: options.detail,
-                cancelId: buttons.length - 1,
-                disableCloseAction: options.sticky,
-                disableDefaultAction: options.sticky,
-                keyEventProcessor: (event) => {
-                    const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-                    if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
-                        if (!allowableCommands.includes(resolved.commandId)) {
-                            EventHelper.stop(event, true);
-                        }
-                    }
-                },
-                buttonStyles: defaultButtonStyles,
-                checkboxStyles: defaultCheckboxStyles,
-                inputBoxStyles: defaultInputBoxStyles,
-                dialogStyles: defaultDialogStyles
-            }));
+                    ? (typeof options.cancellable === 'boolean' ? ( localize(12405, "Cancel")) : options.cancellable)
+                    : ( localize(12406, "Dismiss")));
+            }
+            dialog = ( new Dialog(
+                this.layoutService.activeContainer,
+                message,
+                buttons,
+                createWorkbenchDialogOptions({
+                    type: 'pending',
+                    detail: options.detail,
+                    cancelId: buttons.length - 1,
+                    disableCloseAction: options.sticky,
+                    disableDefaultAction: options.sticky
+                }, this.keybindingService, this.layoutService)
+            ));
             disposables.add(dialog);
             dialog.show().then(dialogResult => {
-                onDidCancel?.(dialogResult.button);
+                if (!taskCompleted) {
+                    onDidCancel?.(dialogResult.button);
+                }
                 dispose(dialog);
             });
             return dialog;
@@ -481,6 +467,7 @@ let ProgressService = class ProgressService extends Disposable {
             }
         });
         promise.finally(() => {
+            taskCompleted = true;
             dispose(disposables);
         });
         if (options.title) {