From 5e63b7f53caf4cd6dc31ebef163bdb9cc8c72c8c Mon Sep 17 00:00:00 2001 From: Akash Satheesan Date: Fri, 9 Apr 2021 17:49:14 +0530 Subject: [PATCH] fix(lib/vscode): fix merge conflicts in localizationsService.ts --- lib/vscode/src/vs/server/browser/client.ts | 3 --- .../electron-sandbox/localizationsService.ts | 27 ------------------- 2 files changed, 30 deletions(-) diff --git a/lib/vscode/src/vs/server/browser/client.ts b/lib/vscode/src/vs/server/browser/client.ts index ebd939bc..3b69a263 100644 --- a/lib/vscode/src/vs/server/browser/client.ts +++ b/lib/vscode/src/vs/server/browser/client.ts @@ -5,7 +5,6 @@ import { localize } from 'vs/nls'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { ILocalizationsService } from 'vs/platform/localizations/common/localizations'; import { ILogService } from 'vs/platform/log/common/log'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -13,7 +12,6 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { TelemetryChannelClient } from 'vs/server/common/telemetry'; import 'vs/workbench/contrib/localizations/browser/localizations.contribution'; -import { LocalizationsService } from 'vs/workbench/services/localizations/electron-sandbox/localizationsService'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; class TelemetryService extends TelemetryChannelClient { @@ -60,7 +58,6 @@ Registry.as(Extensions.Configuration).registerConfigurat } }); -registerSingleton(ILocalizationsService, LocalizationsService); registerSingleton(ITelemetryService, TelemetryService); /** diff --git a/lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts b/lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts index 5e939c4a..5b716004 100644 --- a/lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts +++ b/lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts @@ -4,33 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { ILocalizationsService } from 'vs/platform/localizations/common/localizations'; -<<<<<<< HEAD -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import { IRemoteAgentService } from '../../remote/common/remoteAgentService'; - -// @ts-ignore: interface is implemented via proxy -export class LocalizationsService implements ILocalizationsService { - - declare readonly _serviceBrand: undefined; - - constructor( - @IRemoteAgentService remoteAgentService: IRemoteAgentService, - ) { - /* - NOTE@coder: - Upstream, they use the ISharedProcessService. - - We run this on the browser where there is no shared process so it needs to connect - to the localization channel through the remote agent. - 3/16/21 jsjoeio code-asher - */ - return ProxyChannel.toService(remoteAgentService.getConnection()!.getChannel('localizations')); - } -} - -registerSingleton(ILocalizationsService, LocalizationsService, true); -======= import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services'; registerSharedProcessRemoteService(ILocalizationsService, 'localizations', { supportsDelayedInstantiation: true }); ->>>>>>> 801aed93200dc0ccf325a09089c911e8e2b612d0