Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "allow $openUri to accept a URI and string, adopt consumer but keep the API as is"

Browse Source 
This reverts commit 544b0abf5b.
This commit is contained in:
Johannes Rieken
2019-11-15 10:29:29 +01:00
parent 544b0abf5b
commit e51ef85bcb
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/common/extHostRequireInterceptor.ts
View File

@@ -19,8 +19,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
import { platform } from 'vs/base/common/process';
import { ILogService } from 'vs/platform/log/common/log';
import { matchesScheme } from 'vs/platform/opener/common/opener';
import { Schemas } from 'vs/base/common/network';
interface LoadFunction {
@@ -241,15 +239,15 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
const mainThreadWindow = rpcService.getProxy(MainContext.MainThreadWindow);
this._impl = (target, options) => {
const uri: URI = URI.parse(target);
// If we have options use the original method.
if (options) {
return this.callOriginal(target, options);
}
if (matchesScheme(target, Schemas.http) || matchesScheme(target, Schemas.https)) {
return mainThreadWindow.$openUri(target, { allowTunneling: true });
} else if (matchesScheme(target, Schemas.mailto) || matchesScheme(target, this._appUriScheme)) {
return mainThreadWindow.$openUri(target, {});
if (uri.scheme === 'http' || uri.scheme === 'https') {
return mainThreadWindow.$openUri(uri, { allowTunneling: true });
} else if (uri.scheme === 'mailto' || uri.scheme === this._appUriScheme) {
return mainThreadWindow.$openUri(uri, {});
}
return this.callOriginal(target, options);
};