cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(lib/vscode): fix merge conflicts in localizationsService.ts

Browse Source
This commit is contained in:
Akash Satheesan
2021-04-09 17:49:14 +05:30
parent 448ba0ccf2
commit 5e63b7f53c
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
}
}
registerSingleton(ILocalizationsService, LocalizationsService, true);
=======
import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
registerSharedProcessRemoteService(ILocalizationsService, 'localizations', { supportsDelayedInstantiation: true });
>>>>>>> 801aed93200dc0ccf325a09089c911e8e2b612d0