@codingame/monaco-vscode-view-common-service-override 31.0.0 → 32.0.0

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

@@ -2,16 +2,16 @@ import * as glob from "@codingame/monaco-vscode-api/vscode/vs/base/common/glob";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IUntypedEditorInput } 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 { RegisteredEditorInfo, RegisteredEditorOptions, EditorAssociations, ResolvedEditor, EditorInputFactoryObject } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
-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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { EditorAssociations, EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, ResolvedEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
+import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
 import { PreferredGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService";
 export declare class EditorResolverService extends Disposable implements IEditorResolverService {
     private readonly editorGroupService;
@@ -39,7 +39,12 @@ export declare class EditorResolverService extends Disposable implements IEditor
     bufferChangeEvents(callback: Function): void;
     registerEditor(globPattern: string | glob.IRelativePattern, editorInfo: RegisteredEditorInfo, options: RegisteredEditorOptions, editorFactoryObject: EditorInputFactoryObject): IDisposable;
     getAssociationsForResource(resource: URI): EditorAssociations;
+    private getAssociationsForResourceByType;
+    private getAssociationsForResourceFromSetting;
+    private getRawAssociationsForResourceByType;
+    private getRawAssociationsForResourceFromSetting;
     getAllUserAssociations(): EditorAssociations;
+    private getAllUserAssociationsForSetting;
     /**
      * Given the nested nature of the editors map, we merge factories of the same glob and id to make it flat
      * and easier to work with
@@ -50,6 +55,8 @@ export declare class EditorResolverService extends Disposable implements IEditor
      */
     private get _registeredEditors();
     updateUserAssociations(globPattern: string, editorID: string): void;
+    private updateUserAssociationsForType;
+    private updateUserAssociationsForSetting;
     private findMatchingEditors;
     getEditors(resource?: URI): RegisteredEditorInfo[];
     /**
@@ -57,6 +64,7 @@ export declare class EditorResolverService extends Disposable implements IEditor
      * @returns The editor and whether there was another default which conflicted with it
      */
     private getEditor;
+    private getEffectivePriority;
     private doResolveEditor;
     /**
      * Moves the first existing editor for a resource to the target group unless already opened there.

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

@@ -1,32 +1,38 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { isRelativePattern } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
 import { insert, distinct } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { PauseableEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { isRelativePattern } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
 import { Disposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isEqual, extname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorResolution, EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { isResourceSideBySideEditorInput, EditorResourceAccessor, SideBySideEditor, isEditorInputWithOptions, DEFAULT_EDITOR_ASSOCIATION, isResourceDiffEditorInput, isEditorInputWithOptionsAndGroup, isResourceMergeEditorInput, isResourceMultiDiffEditorInput, isUntitledResourceEditorInput } 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 { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { ResolvedStatus, globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 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 { isResourceSideBySideEditorInput, EditorResourceAccessor, SideBySideEditor, isResourceDiffEditorInput, isResourceMergeEditorInput, isEditorInputWithOptions, DEFAULT_EDITOR_ASSOCIATION, isEditorInputWithOptionsAndGroup, isResourceMultiDiffEditorInput, isUntitledResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 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-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 { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { ResolvedStatus, editorsAssociationsSettingId, diffEditorsAssociationsSettingId, globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 var EditorResolverService_1;
+var EditorAssociationType;
+(function(EditorAssociationType) {
+    EditorAssociationType[EditorAssociationType["Editor"] = 0] = "Editor";
+    EditorAssociationType[EditorAssociationType["DiffEditor"] = 1] = "DiffEditor";
+    EditorAssociationType[EditorAssociationType["MergeEditor"] = 2] = "MergeEditor";
+})(EditorAssociationType || (EditorAssociationType = {}));
 let EditorResolverService = class EditorResolverService extends Disposable {
     static {
         EditorResolverService_1 = this;
@@ -112,7 +118,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         let resource = EditorResourceAccessor.getCanonicalUri(untypedEditor, {
             supportSideBySide: SideBySideEditor.PRIMARY
         });
-        if (this.cache && resource && (this.resourceMatchesCache(resource) || this.resourceMatchesUserAssociation(resource))) {
+        const editorAssociationType = isResourceDiffEditorInput(untypedEditor) ? EditorAssociationType.DiffEditor : isResourceMergeEditorInput(untypedEditor) ? EditorAssociationType.MergeEditor : EditorAssociationType.Editor;
+        if (this.cache && resource && (this.resourceMatchesCache(resource) || this.resourceMatchesUserAssociation(resource, editorAssociationType))) {
             await this.extensionService.whenInstalledExtensionsRegistered();
         }
         if (resource === undefined) {
@@ -132,11 +139,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         let {
             editor: selectedEditor,
             conflictingDefault
-        } = this.getEditor(resource, untypedEditor.options?.override);
+        } = this.getEditor(resource, untypedEditor.options?.override, editorAssociationType);
         if (!selectedEditor && (untypedEditor.options?.override || isEditorInputWithOptions(editor))) {
             return ResolvedStatus.NONE;
         } else if (!selectedEditor) {
-            const resolvedEditor = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id);
+            const resolvedEditor = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id, editorAssociationType);
             selectedEditor = resolvedEditor?.editor;
             conflictingDefault = resolvedEditor?.conflictingDefault;
             if (!selectedEditor) {
@@ -154,12 +161,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
             const {
                 editor: selectedEditor2
-            } = this.getEditor(resource2, undefined);
+            } = this.getEditor(resource2, undefined, editorAssociationType);
             if (!selectedEditor2 || selectedEditor.editorInfo.id !== selectedEditor2.editorInfo.id) {
                 const {
                     editor: selectedDiff,
                     conflictingDefault: conflictingDefaultDiff
-                } = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id);
+                } = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id, editorAssociationType);
                 selectedEditor = selectedDiff;
                 conflictingDefault = conflictingDefaultDiff;
             }
@@ -255,20 +262,45 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         });
     }
     getAssociationsForResource(resource) {
-        const associations = this.getAllUserAssociations();
-        let matchingAssociations = associations.filter(
-            association => association.filenamePattern && globMatchesResource(association.filenamePattern, resource)
-        );
-        matchingAssociations = matchingAssociations.sort(
-            (a, b) => (b.filenamePattern?.length ?? 0) - (a.filenamePattern?.length ?? 0)
-        );
+        return this.getAssociationsForResourceFromSetting(resource, editorsAssociationsSettingId);
+    }
+    getAssociationsForResourceByType(resource, associationType) {
+        if (associationType === EditorAssociationType.DiffEditor || associationType === EditorAssociationType.MergeEditor) {
+            const diffAssociations = this.getAssociationsForResourceFromSetting(resource, diffEditorsAssociationsSettingId);
+            if (diffAssociations.length) {
+                return diffAssociations;
+            }
+        }
+        return this.getAssociationsForResource(resource);
+    }
+    getAssociationsForResourceFromSetting(resource, settingId) {
+        const matchingAssociations = this.getRawAssociationsForResourceFromSetting(resource, settingId);
         const allEditors = this._registeredEditors;
         return matchingAssociations.filter(
             association => allEditors.find(c => c.editorInfo.id === association.viewType)
         );
     }
+    getRawAssociationsForResourceByType(resource, associationType) {
+        if (associationType === EditorAssociationType.Editor) {
+            return this.getRawAssociationsForResourceFromSetting(resource, editorsAssociationsSettingId);
+        }
+        const diffAssociations = this.getRawAssociationsForResourceFromSetting(resource, diffEditorsAssociationsSettingId);
+        return diffAssociations.length ? diffAssociations : this.getRawAssociationsForResourceFromSetting(resource, editorsAssociationsSettingId);
+    }
+    getRawAssociationsForResourceFromSetting(resource, settingId) {
+        const associations = this.getAllUserAssociationsForSetting(settingId);
+        const matchingAssociations = associations.filter(
+            association => association.filenamePattern && globMatchesResource(association.filenamePattern, resource)
+        );
+        return matchingAssociations.sort(
+            (a, b) => (b.filenamePattern?.length ?? 0) - (a.filenamePattern?.length ?? 0)
+        );
+    }
     getAllUserAssociations() {
-        const inspectedEditorAssociations = this.configurationService.inspect(editorsAssociationsSettingId) || {};
+        return this.getAllUserAssociationsForSetting(editorsAssociationsSettingId);
+    }
+    getAllUserAssociationsForSetting(settingId) {
+        const inspectedEditorAssociations = this.configurationService.inspect(settingId) || {};
         const defaultAssociations = inspectedEditorAssociations.defaultValue ?? {};
         const workspaceAssociations = inspectedEditorAssociations.workspaceValue ?? {};
         const userAssociations = inspectedEditorAssociations.userValue ?? {};
@@ -333,24 +365,40 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         return Array.from(( this._flattenedEditors.values())).flat();
     }
     updateUserAssociations(globPattern, editorID) {
+        this.updateUserAssociationsForSetting(editorsAssociationsSettingId, globPattern, editorID);
+    }
+    updateUserAssociationsForType(associationType, globPattern, editorID) {
+        this.updateUserAssociationsForSetting(
+            associationType === EditorAssociationType.DiffEditor ? diffEditorsAssociationsSettingId : editorsAssociationsSettingId,
+            globPattern,
+            editorID
+        );
+    }
+    updateUserAssociationsForSetting(settingId, globPattern, editorID) {
         const newAssociation = {
             viewType: editorID,
             filenamePattern: globPattern
         };
-        const currentAssociations = this.getAllUserAssociations();
+        const currentAssociations = this.getAllUserAssociationsForSetting(settingId);
         const newSettingObject = Object.create(null);
         for (const association of [...currentAssociations, newAssociation]) {
             if (association.filenamePattern) {
                 newSettingObject[association.filenamePattern] = association.viewType;
             }
         }
-        this.configurationService.updateValue(editorsAssociationsSettingId, newSettingObject);
+        this.configurationService.updateValue(settingId, newSettingObject);
     }
-    findMatchingEditors(resource) {
-        const userSettings = this.getAssociationsForResource(resource);
+    findMatchingEditors(resource, associationType = EditorAssociationType.Editor) {
+        const userSettings = this.getAssociationsForResourceByType(resource, associationType);
         const matchingEditors = [];
         for (const [key, editors] of this._flattenedEditors) {
             for (const editor of editors) {
+                if (associationType === EditorAssociationType.DiffEditor && !editor.editorFactoryObject.createDiffEditorInput) {
+                    continue;
+                }
+                if (associationType === EditorAssociationType.MergeEditor && !editor.editorFactoryObject.createMergeEditorInput) {
+                    continue;
+                }
                 const foundInSettings = userSettings.find(setting => setting.viewType === editor.editorInfo.id);
                 if ((foundInSettings && editor.editorInfo.priority !== RegisteredEditorPriority.exclusive) || globMatchesResource(key, resource)) {
                     matchingEditors.push(editor);
@@ -358,10 +406,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         }
         return matchingEditors.sort((a, b) => {
-            if (priorityToRank(b.editorInfo.priority) === priorityToRank(a.editorInfo.priority) && typeof b.globPattern === "string" && typeof a.globPattern === "string") {
+            const aPriority = this.getEffectivePriority(a.editorInfo, associationType);
+            const bPriority = this.getEffectivePriority(b.editorInfo, associationType);
+            if (priorityToRank(bPriority) === priorityToRank(aPriority) && typeof b.globPattern === "string" && typeof a.globPattern === "string") {
                 return b.globPattern.length - a.globPattern.length;
             }
-            return priorityToRank(b.editorInfo.priority) - priorityToRank(a.editorInfo.priority);
+            return priorityToRank(bPriority) - priorityToRank(aPriority);
         });
     }
     getEditors(resource) {
@@ -375,9 +425,15 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         }
         return distinct(( this._registeredEditors.map(editor => editor.editorInfo)), editor => editor.id);
     }
-    getEditor(resource, editorId) {
+    getEditor(resource, editorId, associationType) {
         const findMatchingEditor = (editors, viewType) => {
             return editors.find(editor => {
+                if (associationType === EditorAssociationType.DiffEditor && !editor.editorFactoryObject.createDiffEditorInput) {
+                    return false;
+                }
+                if (associationType === EditorAssociationType.MergeEditor && !editor.editorFactoryObject.createMergeEditorInput) {
+                    return false;
+                }
                 if (editor.options?.canSupportResource !== undefined) {
                     return editor.editorInfo.id === viewType && editor.options.canSupportResource(resource);
                 }
@@ -391,11 +447,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 conflictingDefault: false
             };
         }
-        const editors = this.findMatchingEditors(resource);
-        const associationsFromSetting = this.getAssociationsForResource(resource);
+        const editors = this.findMatchingEditors(resource, associationType);
+        const associationsFromSetting = this.getAssociationsForResourceByType(resource, associationType);
         const minPriority = editorId === EditorResolution.EXCLUSIVE_ONLY ? RegisteredEditorPriority.exclusive : RegisteredEditorPriority.builtin;
         let possibleEditors = editors.filter(
-            editor => priorityToRank(editor.editorInfo.priority) >= priorityToRank(minPriority) && editor.editorInfo.id !== DEFAULT_EDITOR_ASSOCIATION.id
+            editor => priorityToRank(this.getEffectivePriority(editor.editorInfo, associationType)) >= priorityToRank(minPriority) && editor.editorInfo.id !== DEFAULT_EDITOR_ASSOCIATION.id
         );
         if (possibleEditors.length === 0) {
             return {
@@ -403,12 +459,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 conflictingDefault: false
             };
         }
-        const selectedViewType = possibleEditors[0].editorInfo.priority === RegisteredEditorPriority.exclusive ? possibleEditors[0].editorInfo.id : associationsFromSetting[0]?.viewType || (possibleEditors.find(
+        const selectedViewType = this.getEffectivePriority(possibleEditors[0].editorInfo, associationType) === RegisteredEditorPriority.exclusive ? possibleEditors[0].editorInfo.id : associationsFromSetting[0]?.viewType || (possibleEditors.find(
             editor => (!editor.options?.canSupportResource || editor.options.canSupportResource(resource))
         )?.editorInfo.id) || possibleEditors[0].editorInfo.id;
         let conflictingDefault = false;
         possibleEditors = possibleEditors.filter(
-            editor => editor.editorInfo.priority !== RegisteredEditorPriority.exclusive
+            editor => this.getEffectivePriority(editor.editorInfo, associationType) !== RegisteredEditorPriority.exclusive
         ).filter(
             editor => !editor.options?.canSupportResource || editor.options.canSupportResource(resource)
         );
@@ -420,6 +476,16 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             conflictingDefault
         };
     }
+    getEffectivePriority(editorInfo, associationType) {
+        switch (associationType) {
+        case EditorAssociationType.DiffEditor:
+            return editorInfo.diffEditorPriority ?? editorInfo.priority;
+        case EditorAssociationType.MergeEditor:
+            return editorInfo.mergeEditorPriority ?? editorInfo.priority;
+        default:
+            return editorInfo.priority;
+        }
+    }
     async doResolveEditor(editor, group, selectedEditor) {
         let options = editor.options;
         const resource = EditorResourceAccessor.getCanonicalUri(editor, {
@@ -540,7 +606,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         return out;
     }
     async doHandleConflictingDefaults(resource, editorName, untypedInput, currentEditor, group) {
-        const editors = this.findMatchingEditors(resource);
+        const associationType = isResourceDiffEditorInput(untypedInput) ? EditorAssociationType.DiffEditor : isResourceMergeEditorInput(untypedInput) ? EditorAssociationType.MergeEditor : EditorAssociationType.Editor;
+        const editors = this.findMatchingEditors(resource, associationType);
         const storedChoices = JSON.parse(this.storageService.get(
             EditorResolverService_1.conflictingDefaultsStorageID,
             StorageScope.PROFILE,
@@ -560,8 +627,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16186, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(16187, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16493, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(16494, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -579,7 +646,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(16188, "Keep {0}", editorName)),
+            label: ( localize(16495, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -587,11 +654,14 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             onCloseListener.dispose();
         });
     }
-    mapEditorsToQuickPickEntry(resource, showDefaultPicker) {
+    mapEditorsToQuickPickEntry(resource, showDefaultPicker, associationType) {
         const currentEditor = this.editorGroupService.activeGroup.findEditors(resource).at(0);
-        let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource);
+        let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource, associationType);
+        if (associationType === EditorAssociationType.DiffEditor) {
+            registeredEditors = registeredEditors.filter(editor => !!editor.editorFactoryObject.createDiffEditorInput);
+        }
         registeredEditors = distinct(registeredEditors, c => c.editorInfo.id);
-        const defaultSetting = this.getAssociationsForResource(resource)[0]?.viewType;
+        const defaultSetting = this.getAssociationsForResourceByType(resource, associationType)[0]?.viewType;
         registeredEditors = registeredEditors.sort((a, b) => {
             if (a.editorInfo.id === DEFAULT_EDITOR_ASSOCIATION.id) {
                 return -1;
@@ -602,9 +672,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(16189, "Active"));
-        const currentDefaultLabel = ( localize(16190, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(16191, "Active and Default"));
+        const currentlyActiveLabel = ( localize(16496, "Active"));
+        const currentDefaultLabel = ( localize(16497, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(16498, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -631,7 +701,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(16192, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(16499, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -646,12 +716,13 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 scheme: Schemas.untitled
             }));
         }
-        const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
+        const associationType = isResourceDiffEditorInput(editor) ? EditorAssociationType.DiffEditor : EditorAssociationType.Editor;
+        const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker, associationType);
         const disposables = ( new DisposableStore());
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(16193, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16194, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(16500, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16501, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;
@@ -670,7 +741,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                     };
                 }
                 if (resource && showDefaultPicker && result?.item.id) {
-                    this.updateUserAssociations(`*${extname(resource)}`, result.item.id);
+                    this.updateUserAssociationsForType(associationType, `*${extname(resource)}`, result.item.id);
                 }
                 resolve(result);
             }));
@@ -684,7 +755,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                     openInBackground: false
                 });
                 if (resource && e.item?.id) {
-                    this.updateUserAssociations(`*${extname(resource)}`, e.item.id);
+                    this.updateUserAssociationsForType(associationType, `*${extname(resource)}`, e.item.id);
                 }
             }));
             editorPicker.show();
@@ -718,7 +789,10 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 cacheStorage.add(globPattern);
             }
         }
-        const userAssociations = this.getAllUserAssociations();
+        const userAssociations = [
+            ...this.getAllUserAssociations(),
+            ...this.getAllUserAssociationsForSetting(diffEditorsAssociationsSettingId)
+        ];
         for (const association of userAssociations) {
             if (association.filenamePattern) {
                 cacheStorage.add(association.filenamePattern);
@@ -731,10 +805,10 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             StorageTarget.MACHINE
         );
     }
-    resourceMatchesUserAssociation(resource) {
-        const userAssociations = this.getAllUserAssociations();
+    resourceMatchesUserAssociation(resource, associationType) {
+        const userAssociations = this.getRawAssociationsForResourceByType(resource, associationType);
         for (const association of userAssociations) {
-            if (association.filenamePattern && association.viewType !== DEFAULT_EDITOR_ASSOCIATION.id && globMatchesResource(association.filenamePattern, resource)) {
+            if (association.viewType !== DEFAULT_EDITOR_ASSOCIATION.id) {
                 return true;
             }
         }

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

@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         }));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16408, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16409, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16716, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16717, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            16410,
+            16718,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            16411,
+            16719,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            16412,
+            16720,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            16413,
+            16721,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            16414,
+            16722,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            16415,
+            16723,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16416, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16724, "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

@@ -173,20 +173,20 @@ 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(16544, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(16545, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(16853, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(16854, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(16546, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(16855, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(16546, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(16855, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(16547, "Progress Message")),
+                name: ( localize(16856, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -292,7 +292,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(16548, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(16857, "Cancel")),
                             undefined,
                             true
                         );
@@ -484,7 +484,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16548, "Cancel")) : options.cancellable) : ( localize(16549, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16857, "Cancel")) : options.cancellable) : ( localize(16858, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.js

@@ -9,7 +9,6 @@ import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/ed
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { UntitledTextEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { NO_TYPE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 import { IUntitledTextEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service';
@@ -91,7 +90,7 @@ let UntitledTextEditorWorkingCopyEditorHandler = class UntitledTextEditorWorking
         if (!this.handles(workingCopy)) {
             return false;
         }
-        return editor instanceof UntitledTextEditorInput && isEqual(workingCopy.resource, editor.resource);
+        return isEqual(workingCopy.resource, editor.resource);
     }
     createEditor(workingCopy) {
         let editorInputResource;

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.d.ts

@@ -83,8 +83,9 @@ export declare class ViewDescriptorService extends Disposable implements IViewDe
     getViewContainerModel(container: ViewContainer): ViewContainerModel;
     getViewContainerById(id: string): ViewContainer | null;
     getViewContainersByLocation(location: ViewContainerLocation): ViewContainer[];
-    private isViewContainerVisible;
-    private isViewVisible;
+    private isViewContainerEnabled;
+    private isViewEnabled;
+    private isEnabled;
     getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined;
     canMoveViews(): boolean;
     moveViewContainerToLocation(viewContainer: ViewContainer, location: ViewContainerLocation, requestedIndex?: number, reason?: string): void;