Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only override editor opening for resource that have potential custom editors

Browse Source 
For #88525
This commit is contained in:
Matt Bierner
2020-01-13 12:47:04 -08:00
parent 0bf6738abe
commit 2bbe9c5330
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+7 -3
View File
@@ -347,9 +347,15 @@ export class CustomEditorContribution implements IWorkbenchContribution {
options: ITextEditorOptions | undefined,
group: IEditorGroup
): IOpenEditorOverride | undefined {
const userConfiguredEditors = this.customEditorService.getUserConfiguredCustomEditors(resource);
const contributedEditors = this.customEditorService.getContributedCustomEditors(resource);
if (!userConfiguredEditors.length && !contributedEditors.length) {
return;
}
// Check to see if there already an editor for the resource in the group.
// If there is, we want to open that instead of creating a new editor.
// This ensures that we preserve whatever state the editor was previously in
// This ensures that we preserve whatever type of editor was previously being used
// when the user switches back to it.
const existingEditorForResource = group.editors.find(editor => isEqual(resource, editor.getResource()));
if (existingEditorForResource) {
@@ -358,14 +364,12 @@ export class CustomEditorContribution implements IWorkbenchContribution {
};
}
const userConfiguredEditors = this.customEditorService.getUserConfiguredCustomEditors(resource);
if (userConfiguredEditors.length) {
return {
override: this.customEditorService.openWith(resource, userConfiguredEditors.allEditors[0].id, options, group),
};
}
const contributedEditors = this.customEditorService.getContributedCustomEditors(resource);
if (!contributedEditors.length) {
return;
}