Disable custom editors for some specific schemes

mjbvz · mjbvz · commit 3b3674290842 · 2020-06-11T11:52:28.000-07:00
Fixes microsoft#99906
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
@@ -65,6 +65,11 @@ export namespace Schemas {
 	export const oldVscodeWebviewResource = 'vscode-resource';
 
 	export const vscodeWebviewResource = 'vscode-webview-resource';
+
+	/**
+	 * Scheme used for extension pages
+	 */
+	export const extension = 'extension';
 }
 
 class RemoteAuthoritiesImpl {
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -7,6 +7,7 @@ import { distinct, mergeSort } from 'vs/base/common/arrays';
 import { Event } from 'vs/base/common/event';
 import * as glob from 'vs/base/common/glob';
 import { IDisposable, IReference } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
 import { posix } from 'vs/base/common/path';
 import { basename } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
@@ -89,6 +90,11 @@ export interface CustomEditorDescriptor {
 
 export class CustomEditorInfo implements CustomEditorDescriptor {
 
+	private static readonly excludedSchemes = new Set([
+		Schemas.extension,
+		Schemas.webviewPanel,
+	]);
+
 	public readonly id: string;
 	public readonly displayName: string;
 	public readonly providerDisplayName: string;
@@ -108,6 +114,10 @@ export class CustomEditorInfo implements CustomEditorDescriptor {
 	}
 
 	static selectorMatches(selector: CustomEditorSelector, resource: URI): boolean {
+		if (CustomEditorInfo.excludedSchemes.has(resource.scheme)) {
+			return false;
+		}
+
 		if (selector.filenamePattern) {
 			const matchOnPath = selector.filenamePattern.indexOf(posix.sep) >= 0;
 			const target = matchOnPath ? resource.path : basename(resource);
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { EditorInput } from 'vs/workbench/common/editor';
 import { IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
-import { URI } from 'vs/base/common/uri';
 
 export class ExtensionsInput extends EditorInput {
 
@@ -15,7 +16,7 @@ export class ExtensionsInput extends EditorInput {
 
 	get resource() {
 		return URI.from({
-			scheme: 'extension',
+			scheme: Schemas.extension,
 			path: this.extension.identifier.id
 		});
 	}
