From 1b126de794ae4a1fbe2998d5f601ab56436fa2d3 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 3 Apr 2020 13:49:25 -0700
Subject: [PATCH] Show extension display name in custom editor reopen with

Fixes #94368
---
 .../contrib/customEditor/browser/customEditors.ts          | 7 ++++++-
 .../workbench/contrib/customEditor/common/customEditor.ts  | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
index 4dd02f808ae..6cf436a76ef 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -35,9 +35,12 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 
 export const defaultEditorId = 'default';
 
+const builtinProviderDisplayName = nls.localize('builtinProviderDisplayName', "Built-in");
+
 const defaultEditorInfo = new CustomEditorInfo({
 	id: defaultEditorId,
-	displayName: nls.localize('promptOpenWith.defaultEditor', "VS Code's standard text editor"),
+	displayName: nls.localize('promptOpenWith.defaultEditor.displayName', "Text Editor"),
+	providerDisplayName: builtinProviderDisplayName,
 	selector: [
 		{ filenamePattern: '*' }
 	],
@@ -59,6 +62,7 @@ export class CustomEditorInfoStore extends Disposable {
 					this.add(new CustomEditorInfo({
 						id: webviewEditorContribution.viewType,
 						displayName: webviewEditorContribution.displayName,
+						providerDisplayName: extension.description.isBuiltin ? builtinProviderDisplayName : extension.description.displayName || extension.description.identifier.value,
 						selector: webviewEditorContribution.selector || [],
 						priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
 					}));
@@ -193,6 +197,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 			description: editorDescriptor.id === currentlyOpenedEditorType
 				? nls.localize('openWithCurrentlyActive', "Currently Active")
 				: undefined,
+			detail: editorDescriptor.providerDisplayName,
 			buttons: resourceExt ? [{
 				iconClass: 'codicon-settings-gear',
 				tooltip: nls.localize('promptOpenWith.setDefaultTooltip', "Set as default editor for '{0}' files", resourceExt)
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
index 531dba98f07..af547205a4f 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditor.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -76,17 +76,20 @@ export class CustomEditorInfo {
 
 	public readonly id: string;
 	public readonly displayName: string;
+	public readonly providerDisplayName: string | undefined;
 	public readonly priority: CustomEditorPriority;
 	public readonly selector: readonly CustomEditorSelector[];
 
 	constructor(descriptor: {
 		readonly id: string;
 		readonly displayName: string;
+		readonly providerDisplayName: string | undefined;
 		readonly priority: CustomEditorPriority;
 		readonly selector: readonly CustomEditorSelector[];
 	}) {
 		this.id = descriptor.id;
 		this.displayName = descriptor.displayName;
+		this.providerDisplayName = descriptor.providerDisplayName;
 		this.priority = descriptor.priority;
 		this.selector = descriptor.selector;
 	}
-- 
GitLab