@codingame/monaco-vscode-user-data-sync-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "7.0.0"
   }
 }

package/userDataSync.js

@@ -1,5 +1,5 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IUserDataAutoSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncLocalStoreService, IUserDataSyncUtilService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
+import { IUserDataAutoSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncLocalStoreService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { UserDataSyncAccountService } from './vscode/src/vs/platform/userDataSync/common/userDataSyncAccount.js';
 import { IUserDataSyncAccountService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncAccount.service';
 import { UserDataSyncMachinesService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncMachines';
@@ -13,7 +13,6 @@ import { UserDataSyncResourceProviderService } from './vscode/src/vs/platform/us
 import { UserDataSyncLocalStoreService } from './vscode/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.js';
 import { UserDataSyncWorkbenchService } from './vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.js';
 import { IUserDataSyncWorkbenchService } from 'vscode/vscode/vs/workbench/services/userDataSync/common/userDataSync.service';
-import { UserDataSyncUtilService } from './vscode/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-user-data-profile-service-override';
 import './vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.js';
 
@@ -30,8 +29,7 @@ function getServiceOverride() {
         [( IUserDataSyncMachinesService.toString())]: new SyncDescriptor(UserDataSyncMachinesService, [], true),
         [( IUserDataSyncResourceProviderService.toString())]: new SyncDescriptor(UserDataSyncResourceProviderService, [], true),
         [( IUserDataSyncLocalStoreService.toString())]: new SyncDescriptor(UserDataSyncLocalStoreService, [], true),
-        [( IUserDataSyncWorkbenchService.toString())]: new SyncDescriptor(UserDataSyncWorkbenchService, [], true),
-        [( IUserDataSyncUtilService.toString())]: new SyncDescriptor(UserDataSyncUtilService, [], true)
+        [( IUserDataSyncWorkbenchService.toString())]: new SyncDescriptor(UserDataSyncWorkbenchService, [], true)
     };
 }
 

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.js

@@ -1,50 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { getDefaultIgnoredSettings } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
-import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { ITextResourcePropertiesService, ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-
-let UserDataSyncUtilService = class UserDataSyncUtilService {
-    constructor(keybindingsService, textModelService, textResourcePropertiesService, textResourceConfigurationService) {
-        this.keybindingsService = keybindingsService;
-        this.textModelService = textModelService;
-        this.textResourcePropertiesService = textResourcePropertiesService;
-        this.textResourceConfigurationService = textResourceConfigurationService;
-    }
-    async resolveDefaultIgnoredSettings() {
-        return getDefaultIgnoredSettings();
-    }
-    async resolveUserBindings(userBindings) {
-        const keys = {};
-        for (const userbinding of userBindings) {
-            keys[userbinding] = ( this.keybindingsService.resolveUserBinding(userbinding).map(part => part.getUserSettingsLabel())).join(' ');
-        }
-        return keys;
-    }
-    async resolveFormattingOptions(resource) {
-        try {
-            const modelReference = await this.textModelService.createModelReference(resource);
-            const { insertSpaces, tabSize } = modelReference.object.textEditorModel.getOptions();
-            const eol = modelReference.object.textEditorModel.getEOL();
-            modelReference.dispose();
-            return { eol, insertSpaces, tabSize };
-        }
-        catch (e) {
-        }
-        return {
-            eol: this.textResourcePropertiesService.getEOL(resource),
-            insertSpaces: !!this.textResourceConfigurationService.getValue(resource, 'editor.insertSpaces'),
-            tabSize: this.textResourceConfigurationService.getValue(resource, 'editor.tabSize')
-        };
-    }
-};
-UserDataSyncUtilService = ( __decorate([
-    ( __param(0, IKeybindingService)),
-    ( __param(1, ITextModelService)),
-    ( __param(2, ITextResourcePropertiesService)),
-    ( __param(3, ITextResourceConfigurationService))
-], UserDataSyncUtilService));
-
-export { UserDataSyncUtilService };