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

IOpener must accept URI and URL

Browse Source
This commit is contained in:
Johannes Rieken
2019-11-14 10:08:03 +01:00
parent e24fefe0a8
commit 9106843dc2
4 changed files with 124 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/services/url/electron-browser/urlService.ts
View File

@@ -8,7 +8,7 @@ import { URI, UriComponents } from 'vs/base/common/uri';
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
import { URLHandlerChannel } from 'vs/platform/url/common/urlIpc';
import { URLService } from 'vs/platform/url/node/urlService';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IOpenerService, IOpener } from 'vs/platform/opener/common/opener';
import product from 'vs/platform/product/common/product';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IElectronEnvironmentService } from 'vs/workbench/services/electron/electron-browser/electronEnvironmentService';
@@ -20,7 +20,7 @@ export interface IRelayOpenURLOptions extends IOpenURLOptions {
openExternal?: boolean;
}
export class RelayURLService extends URLService implements IURLHandler {
export class RelayURLService extends URLService implements IURLHandler, IOpener {
private urlService: IURLService;
@@ -51,7 +51,12 @@ export class RelayURLService extends URLService implements IURLHandler {
return uri.with({ query });
}
async open(resource: URI, options?: IRelayOpenURLOptions): Promise<boolean> {
async open(resource: URI | URL, options?: IRelayOpenURLOptions): Promise<boolean> {
if (resource instanceof URL) {
resource = URI.from(resource);
}
if (resource.scheme !== product.urlProtocol) {
return false;
}