Browse Source

fix: re-add usersync service (#2612)

Baptiste Augrain 1 week ago
parent
commit
cc1a3ef5bd
1 changed files with 0 additions and 30 deletions
  1. 0 30
      patches/disable-settingssync-logger.patch

+ 0 - 30
patches/disable-settingssync-logger.patch

@@ -1,30 +0,0 @@
-diff --git a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
-index 89d9736..b2a1623 100644
---- a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
-+++ b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
-@@ -61,3 +61,3 @@ import { ExtensionStorageService, IExtensionStorageService } from '../../../plat
- import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from '../../../platform/userDataSync/common/ignoredExtensions.js';
--import { IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncResourceProviderService } from '../../../platform/userDataSync/common/userDataSync.js';
-+import { IUserDataSyncLocalStoreService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncResourceProviderService } from '../../../platform/userDataSync/common/userDataSync.js';
- import { IUserDataSyncAccountService, UserDataSyncAccountService } from '../../../platform/userDataSync/common/userDataSyncAccount.js';
-@@ -65,3 +65,2 @@ import { UserDataSyncLocalStoreService } from '../../../platform/userDataSync/co
- import { UserDataSyncAccountServiceChannel, UserDataSyncStoreManagementServiceChannel } from '../../../platform/userDataSync/common/userDataSyncIpc.js';
--import { UserDataSyncLogService } from '../../../platform/userDataSync/common/userDataSyncLog.js';
- import { IUserDataSyncMachinesService, UserDataSyncMachinesService } from '../../../platform/userDataSync/common/userDataSyncMachines.js';
-@@ -366,3 +365,2 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
- 		services.set(IUserDataSyncAccountService, new SyncDescriptor(UserDataSyncAccountService, undefined, true));
--		services.set(IUserDataSyncLogService, new SyncDescriptor(UserDataSyncLogService, undefined, true));
- 		services.set(IUserDataSyncUtilService, ProxyChannel.toService(this.server.getChannel('userDataSyncUtil', client => client.ctx !== 'main')));
-diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
-index 61d63db..ccd7ff7 100644
---- a/src/vs/workbench/workbench.common.main.ts
-+++ b/src/vs/workbench/workbench.common.main.ts
-@@ -157,4 +157,2 @@ import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService
- import { ExtensionStorageService, IExtensionStorageService } from '../platform/extensionManagement/common/extensionStorage.js';
--import { IUserDataSyncLogService } from '../platform/userDataSync/common/userDataSync.js';
--import { UserDataSyncLogService } from '../platform/userDataSync/common/userDataSyncLog.js';
- import { AllowedExtensionsService } from '../platform/extensionManagement/common/allowedExtensionsService.js';
-@@ -164,3 +162,2 @@ import { AllowedMcpServersService } from '../platform/mcp/common/allowedMcpServe
- 
--registerSingleton(IUserDataSyncLogService, UserDataSyncLogService, InstantiationType.Delayed);
- registerSingleton(IAllowedExtensionsService, AllowedExtensionsService, InstantiationType.Delayed);