debt - adopt channel proxy for localizations

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

@@ -32,11 +32,10 @@ import { ILogService, LogLevel, ILoggerService } from 'vs/platform/log/common/lo
 import { LoggerChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { LocalizationsChannel } from 'vs/platform/localizations/node/localizationsIpc';
 import { combinedDisposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IDownloadService } from 'vs/platform/download/common/download';
-import { IChannel, IServerChannel, StaticRouter, createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel, IServerChannel, StaticRouter, createChannelSender, createChannelReceiver } from 'vs/base/parts/ipc/common/ipc';
 import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
 import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner';
 import { StorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner';
@@ -192,7 +191,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 			server.registerChannel('extensions', channel);
 
 			const localizationsService = accessor.get(ILocalizationsService);
-			const localizationsChannel = new LocalizationsChannel(localizationsService);
+			const localizationsChannel = createChannelReceiver(localizationsService);
 			server.registerChannel('localizations', localizationsChannel);
 
 			const diagnosticsService = accessor.get(IDiagnosticsService);

src/vs/platform/localizations/node/localizationsIpc.ts

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Event } from 'vs/base/common/event';
-import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-
-export class LocalizationsChannel implements IServerChannel {
-
-	onDidLanguagesChange: Event<void>;
-
-	constructor(private service: ILocalizationsService) {
-		this.onDidLanguagesChange = Event.buffer(service.onDidLanguagesChange, true);
-	}
-
-	listen(_: unknown, event: string): Event<any> {
-		switch (event) {
-			case 'onDidLanguagesChange': return this.onDidLanguagesChange;
-		}
-
-		throw new Error(`Event not found: ${event}`);
-	}
-
-	call(_: unknown, command: string, arg?: any): Promise<any> {
-		switch (command) {
-			case 'getLanguageIds': return this.service.getLanguageIds(arg);
-		}
-
-		throw new Error(`Call not found: ${command}`);
-	}
-}

src/vs/platform/localizations/electron-browser/localizationsService.ts → src/vs/workbench/services/localizations/electron-browser/localizationsService.ts

@@ -3,24 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Event } from 'vs/base/common/event';
-import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
+import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
-export class LocalizationsService implements ILocalizationsService {
+export class LocalizationsService {
 
 	_serviceBrand: undefined;
 
-	private channel: IChannel;
-
-	constructor(@ISharedProcessService sharedProcessService: ISharedProcessService) {
-		this.channel = sharedProcessService.getChannel('localizations');
-	}
-
-	get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
-
-	getLanguageIds(type?: LanguageType): Promise<string[]> {
-		return this.channel.call('getLanguageIds', type);
+	constructor(
+		@ISharedProcessService sharedProcessService: ISharedProcessService,
+	) {
+		return createChannelSender<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
 	}
 }
+
+registerSingleton(ILocalizationsService, LocalizationsService);

src/vs/workbench/workbench.desktop.main.ts

@@ -56,12 +56,11 @@ import 'vs/workbench/services/request/electron-browser/requestService';
 import 'vs/workbench/services/lifecycle/electron-browser/lifecycleService';
 import 'vs/workbench/services/sharedProcess/electron-browser/sharedProcessService';
 import 'vs/workbench/services/electron/electron-browser/electronService';
+import 'vs/workbench/services/localizations/electron-browser/localizationsService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ClipboardService } from 'vs/platform/clipboard/electron-browser/clipboardService';
-import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { LocalizationsService } from 'vs/platform/localizations/electron-browser/localizationsService';
 import { IUpdateService } from 'vs/platform/update/common/update';
 import { UpdateService } from 'vs/platform/update/electron-browser/updateService';
 import { IIssueService } from 'vs/platform/issue/node/issue';
@@ -70,7 +69,6 @@ import { IMenubarService } from 'vs/platform/menubar/node/menubar';
 import { MenubarService } from 'vs/platform/menubar/electron-browser/menubarService';
 
 registerSingleton(IClipboardService, ClipboardService, true);
-registerSingleton(ILocalizationsService, LocalizationsService);
 registerSingleton(IUpdateService, UpdateService);
 registerSingleton(IIssueService, IssueService);
 registerSingleton(IMenubarService, MenubarService);