OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

fix(lib/vscode): update electron-sandbox localizationService

Browse Source 
I'm not sure if we even use this but they changed the LocalizationService.o

It looks like it using one called ISharedProcessService now.
This commit is contained in:
Joe Previte 2021-03-11 11:09:37 -07:00
parent 42ff0ec5e7
commit 8512be85a5
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
View File

@ -5,12 +5,8 @@
import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations'; import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
=======
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services'; import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
// @ts-ignore: interface is implemented via proxy // @ts-ignore: interface is implemented via proxy
export class LocalizationsService implements ILocalizationsService { export class LocalizationsService implements ILocalizationsService {
@ -18,13 +14,9 @@ export class LocalizationsService implements ILocalizationsService {
declare readonly _serviceBrand: undefined; declare readonly _serviceBrand: undefined;
constructor( constructor(
@IRemoteAgentService remoteAgentService: IRemoteAgentService, @ISharedProcessService sharedProcessService: ISharedProcessService,
) { ) {
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
return createChannelSender<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
=======
return ProxyChannel.toService<ILocalizationsService>(sharedProcessService.getChannel('localizations')); return ProxyChannel.toService<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
} }
} }