Skip to content

Commit 8512be8

Browse files
committed
fix(lib/vscode): update electron-sandbox localizationService
I'm not sure if we even use this but they changed the LocalizationService.o It looks like it using one called ISharedProcessService now.
1 parent 42ff0ec commit 8512be8

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,18 @@
55

66
import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
77
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
8-
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
9-
=======
108
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
11-
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
129
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
13-
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
1410

1511
// @ts-ignore: interface is implemented via proxy
1612
export class LocalizationsService implements ILocalizationsService {
1713

1814
declare readonly _serviceBrand: undefined;
1915

2016
constructor(
21-
@IRemoteAgentService remoteAgentService: IRemoteAgentService,
17+
@ISharedProcessService sharedProcessService: ISharedProcessService,
2218
) {
23-
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
24-
return createChannelSender<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
25-
=======
2619
return ProxyChannel.toService<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
27-
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
2820
}
2921
}
3022

0 commit comments

Comments
 (0)