From 217824cc163ba532cc0b55f22987daaef1a7b7c9 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 16 Jan 2019 12:24:36 +0100 Subject: [PATCH] Simplify transformers --- src/vs/base/common/uriIpc.ts | 10 ++++++---- src/vs/code/node/cliProcessMain.ts | 2 +- src/vs/platform/download/node/downloadIpc.ts | 2 +- .../extensionManagement/node/extensionManagementIpc.ts | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts index 10e24307da0..4cee99c11f7 100644 --- a/src/vs/base/common/uriIpc.ts +++ b/src/vs/base/common/uriIpc.ts @@ -8,8 +8,8 @@ import { MarshalledObject } from 'vs/base/common/marshalling'; export interface IURITransformer { transformIncoming(uri: UriComponents): UriComponents; - transformOutgoing(uri: URI): URI; transformOutgoing(uri: UriComponents): UriComponents; + transformOutgoingURI(uri: URI): URI; } export const DefaultURITransformer: IURITransformer = new class { @@ -17,9 +17,11 @@ export const DefaultURITransformer: IURITransformer = new class { return uri; } - transformOutgoing(uri: URI): URI; - transformOutgoing(uri: UriComponents): UriComponents; - transformOutgoing(uri: URI | UriComponents): URI | UriComponents { + transformOutgoing(uri: UriComponents): UriComponents { + return uri; + } + + transformOutgoingURI(uri: URI): URI { return uri; } }; diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 2bc020d9a28..50b202a6a64 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -63,7 +63,7 @@ export function getIdAndVersion(id: string): [string, string | undefined] { } -class Main { +export class Main { constructor( @IEnvironmentService private readonly environmentService: IEnvironmentService, diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts index 03369f885ca..10210cfb5b0 100644 --- a/src/vs/platform/download/node/downloadIpc.ts +++ b/src/vs/platform/download/node/downloadIpc.ts @@ -47,7 +47,7 @@ export class DownloadServiceChannelClient implements IDownloadService { constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer) { } download(from: URI, to: string): Promise { - from = this.getUriTransformer().transformOutgoing(from); + from = this.getUriTransformer().transformOutgoingURI(from); const dirName = path.dirname(to); let out: fs.WriteStream; return new Promise((c, e) => { diff --git a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts index 56e64302099..e7fafc49e92 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts @@ -16,7 +16,7 @@ function transformIncomingURI(uri: UriComponents, transformer: IURITransformer | } function transformOutgoingURI(uri: URI, transformer: IURITransformer | null): URI { - return transformer ? transformer.transformOutgoing(uri) : uri; + return transformer ? transformer.transformOutgoingURI(uri) : uri; } function transformIncomingExtension(extension: ILocalExtension, transformer: IURITransformer | null): ILocalExtension { @@ -27,7 +27,7 @@ function transformIncomingExtension(extension: ILocalExtension, transformer: IUR } function transformOutgoingExtension(extension: ILocalExtension, transformer: IURITransformer | null): ILocalExtension { - return transformer ? cloneAndChange(extension, value => value instanceof URI ? transformer.transformOutgoing(value) : undefined) : extension; + return transformer ? cloneAndChange(extension, value => value instanceof URI ? transformer.transformOutgoingURI(value) : undefined) : extension; } export class ExtensionManagementChannel implements IServerChannel { -- GitLab