diff --git a/src/vs/workbench/api/browser/mainThreadUrls.ts b/src/vs/workbench/api/browser/mainThreadUrls.ts index 75fdde3e495..397b831894d 100644 --- a/src/vs/workbench/api/browser/mainThreadUrls.ts +++ b/src/vs/workbench/api/browser/mainThreadUrls.ts @@ -8,7 +8,7 @@ import { extHostNamedCustomer } from '../common/extHostCustomers'; import { IURLService, IURLHandler } from 'vs/platform/url/common/url'; import { URI, UriComponents } from 'vs/base/common/uri'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/common/inactiveExtensionUrlHandler'; +import { IExtensionUrlHandler } from 'vs/workbench/services/extensions/common/extensionUrlHandler'; import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; class ExtensionUrlHandler implements IURLHandler { @@ -37,7 +37,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { constructor( context: IExtHostContext, @IURLService private readonly urlService: IURLService, - @IExtensionUrlHandler private readonly inactiveExtensionUrlHandler: IExtensionUrlHandler + @IExtensionUrlHandler private readonly extensionUrlHandler: IExtensionUrlHandler ) { this.proxy = context.getProxy(ExtHostContext.ExtHostUrls); } @@ -47,7 +47,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { const disposable = this.urlService.registerHandler(handler); this.handlers.set(handle, { extensionId, disposable }); - this.inactiveExtensionUrlHandler.registerExtensionHandler(extensionId, handler); + this.extensionUrlHandler.registerExtensionHandler(extensionId, handler); return Promise.resolve(undefined); } @@ -61,7 +61,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { const { extensionId, disposable } = tuple; - this.inactiveExtensionUrlHandler.unregisterExtensionHandler(extensionId); + this.extensionUrlHandler.unregisterExtensionHandler(extensionId); this.handlers.delete(handle); disposable.dispose(); diff --git a/src/vs/workbench/services/extensions/common/inactiveExtensionUrlHandler.ts b/src/vs/workbench/services/extensions/common/extensionUrlHandler.ts similarity index 99% rename from src/vs/workbench/services/extensions/common/inactiveExtensionUrlHandler.ts rename to src/vs/workbench/services/extensions/common/extensionUrlHandler.ts index 8b53e669f63..c8d9d320630 100644 --- a/src/vs/workbench/services/extensions/common/inactiveExtensionUrlHandler.ts +++ b/src/vs/workbench/services/extensions/common/extensionUrlHandler.ts @@ -34,7 +34,7 @@ function isExtensionId(value: string): boolean { return /^[a-z0-9][a-z0-9\-]*\.[a-z0-9][a-z0-9\-]*$/i.test(value); } -export const IExtensionUrlHandler = createDecorator('inactiveExtensionUrlHandler'); +export const IExtensionUrlHandler = createDecorator('extensionUrlHandler'); export interface IExtensionUrlHandler { readonly _serviceBrand: undefined; @@ -43,7 +43,7 @@ export interface IExtensionUrlHandler { } /** - * This class handles URLs which are directed towards inactive extensions. + * This class handles URLs which are directed towards extensions. * If a URL is directed towards an inactive extension, it buffers it, * activates the extension and re-opens the URL once the extension registers * a URL handler. If the extension never registers a URL handler, the urls diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index c2f7f1a9581..0ffdec8e834 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -52,7 +52,7 @@ import 'vs/workbench/browser/parts/views/views'; //#region --- workbench services -import 'vs/workbench/services/extensions/common/inactiveExtensionUrlHandler'; +import 'vs/workbench/services/extensions/common/extensionUrlHandler'; import 'vs/workbench/services/bulkEdit/browser/bulkEditService'; import 'vs/workbench/services/keybinding/common/keybindingEditing'; import 'vs/workbench/services/decorations/browser/decorationsService';