Remove customEditor.scheme contribution point

mjbvz · mjbvz · commit cd90f80b3e61 · 2019-09-25T19:04:31.000-07:00
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -303,18 +303,11 @@ function matches(selector: CustomEditorSelector, resource: URI): boolean {
 		return glob.match(selector.mime, mime.toLowerCase());
 	}
 
-	if (!selector.filenamePattern && !selector.scheme) {
-		return false;
-	}
 	if (selector.filenamePattern) {
-		if (!glob.match(selector.filenamePattern.toLowerCase(), basename(resource).toLowerCase())) {
-			return false;
-		}
-	}
-	if (selector.scheme) {
-		if (resource.scheme !== selector.scheme) {
-			return false;
+		if (glob.match(selector.filenamePattern.toLowerCase(), basename(resource).toLowerCase())) {
+			return true;
 		}
 	}
-	return true;
+
+	return false;
 }
diff --git a/src/vs/workbench/contrib/customEditor/browser/webviewEditor.contribution.ts b/src/vs/workbench/contrib/customEditor/browser/webviewEditor.contribution.ts
@@ -54,9 +54,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 							type: 'string',
 							description: nls.localize('editor.editorAssociations.viewType', "Editor view type."),
 						},
-						'scheme': {
+						'mime': {
 							type: 'string',
-							description: nls.localize('editor.editorAssociations.scheme', "Uri scheme the editor should be used for."),
+							description: nls.localize('editor.editorAssociations.mime', "Mime type the editor should be used for. This is used for binary files."),
 						},
 						'filenamePattern': {
 							type: 'string',
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -29,7 +29,6 @@ export const enum CustomEditorDiscretion {
 }
 
 export interface CustomEditorSelector {
-	readonly scheme?: string;
 	readonly filenamePattern?: string;
 	readonly mime?: string;
 }

Original file line number	Diff line number	Diff line change
`@@ -303,18 +303,11 @@ function matches(selector: CustomEditorSelector, resource: URI): boolean {`
`303`	`303`	`return glob.match(selector.mime, mime.toLowerCase());`
`304`	`304`	`}`
`305`	`305`
`306`		`- if (!selector.filenamePattern && !selector.scheme) {`
`307`		`- return false;`
`308`		`- }`
`309`	`306`	`if (selector.filenamePattern) {`
`310`		`- if (!glob.match(selector.filenamePattern.toLowerCase(), basename(resource).toLowerCase())) {`
`311`		`- return false;`
`312`		`- }`
`313`		`- }`
`314`		`- if (selector.scheme) {`
`315`		`- if (resource.scheme !== selector.scheme) {`
`316`		`- return false;`
	`307`	`+ if (glob.match(selector.filenamePattern.toLowerCase(), basename(resource).toLowerCase())) {`
	`308`	`+ return true;`
`317`	`309`	`}`
`318`	`310`	`}`
`319`		`- return true;`
	`311`	`+`
	`312`	`+ return false;`
`320`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ export const enum CustomEditorDiscretion {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`export interface CustomEditorSelector {`
`32`		`- readonly scheme?: string;`
`33`	`32`	`readonly filenamePattern?: string;`
`34`	`33`	`readonly mime?: string;`
`35`	`34`	`}`