opn/open should work with app URI scheme too

Benjamin Pasero · Benjamin Pasero · commit d712aeb26b67 · 2019-10-22T12:06:37.000+02:00
diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
@@ -57,7 +57,7 @@ export abstract class RequireInterceptor {
 		this.register(new VSCodeNodeModuleFactory(this._apiFactory, extensionPaths, this._extensionRegistry, configProvider));
 		this.register(this._instaService.createInstance(KeytarNodeModuleFactory));
 		if (this._initData.remote.isRemote) {
-			this.register(this._instaService.createInstance(OpenNodeModuleFactory, extensionPaths));
+			this.register(this._instaService.createInstance(OpenNodeModuleFactory, extensionPaths, this._initData.environment.appUriScheme));
 		}
 	}
 
@@ -228,6 +228,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
 
 	constructor(
 		private readonly _extensionPaths: TernarySearchTree<IExtensionDescription>,
+		private readonly _appUriScheme: string,
 		@IExtHostRpcService rpcService: IExtHostRpcService,
 	) {
 
@@ -242,7 +243,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
 			}
 			if (uri.scheme === 'http' || uri.scheme === 'https') {
 				return mainThreadWindow.$openUri(uri, { allowTunneling: true });
-			} else if (uri.scheme === 'mailto') {
+			} else if (uri.scheme === 'mailto' || uri.scheme === this._appUriScheme) {
 				return mainThreadWindow.$openUri(uri, {});
 			}
 			return this.callOriginal(target, options);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export abstract class RequireInterceptor {`
`57`	`57`	`this.register(new VSCodeNodeModuleFactory(this._apiFactory, extensionPaths, this._extensionRegistry, configProvider));`
`58`	`58`	`this.register(this._instaService.createInstance(KeytarNodeModuleFactory));`
`59`	`59`	`if (this._initData.remote.isRemote) {`
`60`		`- this.register(this._instaService.createInstance(OpenNodeModuleFactory, extensionPaths));`
	`60`	`+ this.register(this._instaService.createInstance(OpenNodeModuleFactory, extensionPaths, this._initData.environment.appUriScheme));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -228,6 +228,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {`
`228`	`228`
`229`	`229`	`constructor(`
`230`	`230`	`private readonly _extensionPaths: TernarySearchTree<IExtensionDescription>,`
	`231`	`+ private readonly _appUriScheme: string,`
`231`	`232`	`@IExtHostRpcService rpcService: IExtHostRpcService,`
`232`	`233`	`) {`
`233`	`234`
`@@ -242,7 +243,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {`
`242`	`243`	`}`
`243`	`244`	`if (uri.scheme === 'http' \|\| uri.scheme === 'https') {`
`244`	`245`	`return mainThreadWindow.$openUri(uri, { allowTunneling: true });`
`245`		`- } else if (uri.scheme === 'mailto') {`
	`246`	`+ } else if (uri.scheme === 'mailto' \|\| uri.scheme === this._appUriScheme) {`
`246`	`247`	`return mainThreadWindow.$openUri(uri, {});`
`247`	`248`	`}`
`248`	`249`	`return this.callOriginal(target, options);`