@codingame/monaco-vscode-user-data-sync-service-override 25.1.2 → 26.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "25.1.2",
+  "version": "26.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - user-data-sync service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.1",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "26.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/userDataSync/common/mcpSync.js

@@ -14,34 +14,40 @@ function getMcpContentFromSyncContent(syncContent, logService) {
     try {
         const parsed = JSON.parse(syncContent);
         return parsed.mcp ?? null;
-    }
-    catch (e) {
+    } catch (e) {
         logService.error(e);
         return null;
     }
 }
 let McpSynchroniser = class McpSynchroniser extends AbstractJsonSynchronizer {
-    constructor(profile, collection, userDataSyncStoreService, userDataSyncLocalStoreService, logService, configurationService, userDataSyncEnablementService, fileService, environmentService, storageService, telemetryService, uriIdentityService) {
-        super(profile.mcpResource, { syncResource: SyncResource.Mcp, profile }, collection, 'mcp.json', fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+    constructor(
+        profile,
+        collection,
+        userDataSyncStoreService,
+        userDataSyncLocalStoreService,
+        logService,
+        configurationService,
+        userDataSyncEnablementService,
+        fileService,
+        environmentService,
+        storageService,
+        telemetryService,
+        uriIdentityService
+    ) {
+        super(profile.mcpResource, {
+            syncResource: SyncResource.Mcp,
+            profile
+        }, collection, "mcp.json", fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
     }
     getContentFromSyncContent(syncContent) {
         return getMcpContentFromSyncContent(syncContent, this.logService);
     }
     toSyncContent(mcp) {
-        return mcp ? { mcp } : {};
+        return mcp ? {
+            mcp
+        } : {};
     }
 };
-McpSynchroniser = ( __decorate([
-    ( __param(2, IUserDataSyncStoreService)),
-    ( __param(3, IUserDataSyncLocalStoreService)),
-    ( __param(4, IUserDataSyncLogService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IUserDataSyncEnablementService)),
-    ( __param(7, IFileService)),
-    ( __param(8, IEnvironmentService)),
-    ( __param(9, IStorageService)),
-    ( __param(10, ITelemetryService)),
-    ( __param(11, IUriIdentityService))
-], McpSynchroniser));
+McpSynchroniser = ( __decorate([( __param(2, IUserDataSyncStoreService)), ( __param(3, IUserDataSyncLocalStoreService)), ( __param(4, IUserDataSyncLogService)), ( __param(5, IConfigurationService)), ( __param(6, IUserDataSyncEnablementService)), ( __param(7, IFileService)), ( __param(8, IEnvironmentService)), ( __param(9, IStorageService)), ( __param(10, ITelemetryService)), ( __param(11, IUriIdentityService))], McpSynchroniser));
 
 export { McpSynchroniser, getMcpContentFromSyncContent };

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsMerge.js

@@ -6,16 +6,32 @@ function merge(local, remote, base) {
     const localRemoved = ( new Set());
     if (!remote) {
         return {
-            local: { added: localAdded, updated: localUpdated, removed: [...( localRemoved.values())] },
-            remote: { added: local, updated: {}, removed: [] },
+            local: {
+                added: localAdded,
+                updated: localUpdated,
+                removed: [...( localRemoved.values())]
+            },
+            remote: {
+                added: local,
+                updated: {},
+                removed: []
+            },
             conflicts: []
         };
     }
     const localToRemote = compare(local, remote);
     if (localToRemote.added.size === 0 && localToRemote.removed.size === 0 && localToRemote.updated.size === 0) {
         return {
-            local: { added: localAdded, updated: localUpdated, removed: [...( localRemoved.values())] },
-            remote: { added: {}, updated: {}, removed: [] },
+            local: {
+                added: localAdded,
+                updated: localUpdated,
+                removed: [...( localRemoved.values())]
+            },
+            remote: {
+                added: {},
+                updated: {},
+                removed: []
+            },
             conflicts: []
         };
     }
@@ -52,8 +68,7 @@ function merge(local, remote, base) {
             if (( localToRemote.updated.has(key))) {
                 conflicts.add(key);
             }
-        }
-        else {
+        } else {
             remoteUpdated[key] = local[key];
         }
     }
@@ -65,8 +80,7 @@ function merge(local, remote, base) {
             if (( localToRemote.updated.has(key))) {
                 conflicts.add(key);
             }
-        }
-        else if (local[key] !== undefined) {
+        } else if (local[key] !== undefined) {
             localUpdated[key] = remote[key];
         }
     }
@@ -78,8 +92,7 @@ function merge(local, remote, base) {
             if (( localToRemote.updated.has(key))) {
                 conflicts.add(key);
             }
-        }
-        else {
+        } else {
             remoteAdded[key] = local[key];
         }
     }
@@ -91,22 +104,35 @@ function merge(local, remote, base) {
             if (( localToRemote.updated.has(key))) {
                 conflicts.add(key);
             }
-        }
-        else {
+        } else {
             localAdded[key] = remote[key];
         }
     }
     return {
-        local: { added: localAdded, removed: [...( localRemoved.values())], updated: localUpdated },
-        remote: { added: remoteAdded, removed: [...( remoteRemoved.values())], updated: remoteUpdated },
-        conflicts: [...( conflicts.values())],
+        local: {
+            added: localAdded,
+            removed: [...( localRemoved.values())],
+            updated: localUpdated
+        },
+        remote: {
+            added: remoteAdded,
+            removed: [...( remoteRemoved.values())],
+            updated: remoteUpdated
+        },
+        conflicts: [...( conflicts.values())]
     };
 }
 function compare(from, to) {
     const fromKeys = from ? ( Object.keys(from)) : [];
     const toKeys = to ? ( Object.keys(to)) : [];
-    const added = toKeys.filter(key => !fromKeys.includes(key)).reduce((r, key) => { r.add(key); return r; }, ( new Set()));
-    const removed = fromKeys.filter(key => !toKeys.includes(key)).reduce((r, key) => { r.add(key); return r; }, ( new Set()));
+    const added = toKeys.filter(key => !fromKeys.includes(key)).reduce((r, key) => {
+        r.add(key);
+        return r;
+    }, ( new Set()));
+    const removed = fromKeys.filter(key => !toKeys.includes(key)).reduce((r, key) => {
+        r.add(key);
+        return r;
+    }, ( new Set()));
     const updated = ( new Set());
     for (const key of fromKeys) {
         if (( removed.has(key))) {
@@ -118,10 +144,18 @@ function compare(from, to) {
             updated.add(key);
         }
     }
-    return { added, removed, updated };
+    return {
+        added,
+        removed,
+        updated
+    };
 }
 function areSame(a, b) {
-    const { added, removed, updated } = compare(a, b);
+    const {
+        added,
+        removed,
+        updated
+    } = compare(a, b);
     return added.size === 0 && removed.size === 0 && updated.size === 0;
 }