From e2b07d79daa2440441912eaf8cdfe750d7639357 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Sat, 21 Apr 2018 10:45:22 +0200 Subject: [PATCH] ProtocolHandler --- .../electron-browser/inactiveExtensionUrlHandler.ts | 2 -- src/vs/vscode.proposed.d.ts | 6 +++--- .../workbench/api/electron-browser/mainThreadUrls.ts | 4 ++-- src/vs/workbench/api/node/extHost.api.impl.ts | 4 ++-- src/vs/workbench/api/node/extHost.protocol.ts | 4 ++-- src/vs/workbench/api/node/extHostUrls.ts | 10 +++++----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts index 9f9c05762c9..5fbb0acd987 100644 --- a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts +++ b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts @@ -98,8 +98,6 @@ export class InactiveExtensionUrlHandler implements IInactiveExtensionUrlHandler // forget about all uris buffered more than 5 minutes ago private garbageCollect(): void { - console.log('garbage collect'); - const now = new Date().getTime(); const uriBuffer = new Map(); diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index c3dc4f6c07f..b2c22774a38 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -660,8 +660,8 @@ declare module 'vscode' { //#region URLs - export interface ExternalUriHandler { - handleExternalUri(uri: Uri): void; + export interface ProtocolHandler { + handleUri(uri: Uri): void; } export namespace window { @@ -669,7 +669,7 @@ declare module 'vscode' { /** * Registers a protocol handler capable of handling system-wide URIs. */ - export function registerExternalUriHandler(handler: ExternalUriHandler): Disposable; + export function registerProtocolHandler(handler: ProtocolHandler): Disposable; } //#endregion diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts index 1923e437eb1..c9fc7ab862b 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts @@ -42,7 +42,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { this.proxy = context.getProxy(ExtHostContext.ExtHostUrls); } - $registerExternalUriHandler(handle: number, extensionId: string): TPromise { + $registerProtocolHandler(handle: number, extensionId: string): TPromise { const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId); const disposable = this.urlService.registerHandler(handler); @@ -52,7 +52,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { return TPromise.as(null); } - $unregisterExternalUriHandler(handle: number): TPromise { + $unregisterProtocolHandler(handle: number): TPromise { const tuple = this.handlers.get(handle); if (!tuple) { diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 688f4f3460f..d477382fdf9 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -434,8 +434,8 @@ export function createApiFactory( registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => { return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer); }), - registerExternalUriHandler: proposedApiFunction(extension, (handler: vscode.ExternalUriHandler) => { - return extHostUrls.registerExternalUriHandler(extension.id, handler); + registerProtocolHandler: proposedApiFunction(extension, (handler: vscode.ProtocolHandler) => { + return extHostUrls.registerProtocolHandler(extension.id, handler); }) }; diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index f2aba8c2861..dc7aba45b18 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -374,8 +374,8 @@ export interface ExtHostWebviewsShape { } export interface MainThreadUrlsShape extends IDisposable { - $registerExternalUriHandler(handle: number, extensionId: string): TPromise; - $unregisterExternalUriHandler(handle: number): TPromise; + $registerProtocolHandler(handle: number, extensionId: string): TPromise; + $unregisterProtocolHandler(handle: number): TPromise; } export interface ExtHostUrlsShape { diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts index c4ba32abf0e..6732afcad4d 100644 --- a/src/vs/workbench/api/node/extHostUrls.ts +++ b/src/vs/workbench/api/node/extHostUrls.ts @@ -14,7 +14,7 @@ export class ExtHostUrls implements ExtHostUrlsShape { private static HandlePool = 0; private readonly _proxy: MainThreadUrlsShape; - private handlers = new Map(); + private handlers = new Map(); constructor( mainContext: IMainContext @@ -22,14 +22,14 @@ export class ExtHostUrls implements ExtHostUrlsShape { this._proxy = mainContext.getProxy(MainContext.MainThreadUrls); } - registerExternalUriHandler(extensionId: string, handler: vscode.ExternalUriHandler): vscode.Disposable { + registerProtocolHandler(extensionId: string, handler: vscode.ProtocolHandler): vscode.Disposable { const handle = ExtHostUrls.HandlePool++; this.handlers.set(handle, handler); - this._proxy.$registerExternalUriHandler(handle, extensionId); + this._proxy.$registerProtocolHandler(handle, extensionId); return toDisposable(() => { this.handlers.delete(handle); - this._proxy.$unregisterExternalUriHandler(handle); + this._proxy.$unregisterProtocolHandler(handle); }); } @@ -40,7 +40,7 @@ export class ExtHostUrls implements ExtHostUrlsShape { return TPromise.as(null); } - handler.handleExternalUri(URI.revive(uri)); + handler.handleUri(URI.revive(uri)); return TPromise.as(null); } } \ No newline at end of file -- GitLab