@codingame/monaco-vscode-user-data-profile-service-override 6.0.2 → 6.0.3

package/package.json

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

package/userDataProfile.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IUserDataSyncStoreManagementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
+import { IUserDataSyncStoreManagementService, IUserDataSyncUtilService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { BrowserUserDataProfilesService } from './vscode/src/vs/platform/userDataProfile/browser/userDataProfile.js';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { UserDataInitializationService } from './vscode/src/vs/workbench/services/userData/browser/userDataInit.js';
@@ -24,6 +24,7 @@ import { UserDataProfileManagementService } from './vscode/src/vs/workbench/serv
 import { IUserDataProfileStorageService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfileStorageService.service';
 import { UserDataProfileStorageService } from './vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.js';
 import { UserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfileService';
+import { UserDataSyncUtilService } from './vscode/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.js';
 import { registerServiceInitializePostParticipant } from 'vscode/lifecycle';
 import { getWorkspaceIdentifier } from 'vscode/workbench';
 import './vscode/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.js';
@@ -111,7 +112,8 @@ function getServiceOverride() {
         [( IUserDataInitializationService.toString())]: new SyncDescriptor(InjectedUserDataInitializationService, [], true),
         [( IUserDataProfileImportExportService.toString())]: new SyncDescriptor(UserDataProfileImportExportService, [], true),
         [( IUserDataProfileManagementService.toString())]: new SyncDescriptor(UserDataProfileManagementService, [], true),
-        [( IUserDataProfileStorageService.toString())]: new SyncDescriptor(UserDataProfileStorageService, [], true)
+        [( IUserDataProfileStorageService.toString())]: new SyncDescriptor(UserDataProfileStorageService, [], true),
+        [( IUserDataSyncUtilService.toString())]: new SyncDescriptor(UserDataSyncUtilService, [], true)
     };
 }
 

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

@@ -0,0 +1,50 @@
+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 };