@codingame/monaco-vscode-extension-gallery-service-override 9.0.2 → 10.0.0

package/_virtual/semver.js

@@ -0,0 +1,5 @@
+import { __require } from 'vscode/external/vscode-semver/semver.js';
+
+var semverExports = __require();
+
+export { semverExports };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "9.0.2",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

package/tools.js

@@ -18,7 +18,7 @@ function memoizedConstructor(ctor) {
     });
 }
 async function sleep(duration) {
-    await new Promise(resolve => setTimeout(resolve, duration));
+    await new Promise((resolve) => setTimeout(resolve, duration));
 }
 function throttle(fct, merge, delay) {
     let lastPromise = Promise.resolve();
@@ -26,7 +26,9 @@ function throttle(fct, merge, delay) {
     return async (param) => {
         if (toConsume == null) {
             toConsume = param;
-            lastPromise = lastPromise.then(async () => await sleep(delay)).then(async () => {
+            lastPromise = lastPromise
+                .then(async () => await sleep(delay))
+                .then(async () => {
                 const _toConsume = toConsume;
                 toConsume = null;
                 await fct(_toConsume);

package/vscode/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.js

@@ -7,13 +7,12 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
-import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
-import { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManagementErrorCode, InstallOperation, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, StatisticType, TargetPlatformToString, ExtensionGalleryError, ExtensionGalleryErrorCode } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { isTargetPlatformCompatible, ExtensionManagementError, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, TargetPlatformToString, ExtensionGalleryError, ExtensionSignatureVerificationCode } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions, ExtensionKey, getGalleryExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { isApplicationScopedExtension, ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { areApiProposalsCompatible } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
@@ -71,7 +70,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             throw ( (new ExtensionManagementError(
                 `Unknown error while installing extension ${extension.identifier.id}`,
-                ExtensionManagementErrorCode.Unknown
+                "Unknown"
             )));
         }
         catch (error) {
@@ -81,8 +80,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
             throw ( (new ExtensionManagementError(
-                localize(11162, "Marketplace is not enabled"),
-                ExtensionManagementErrorCode.NotAllowed
+                localize(11275, "Marketplace is not enabled"),
+                "NotAllowed"
             )));
         }
         const results = [];
@@ -93,7 +92,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 installableExtensions.push({ ...compatible, options });
             }
             catch (error) {
-                results.push({ identifier: extension.identifier, operation: InstallOperation.Install, source: extension, error, profileLocation: options.profileLocation ?? this.getCurrentExtensionsManifestLocation() });
+                results.push({ identifier: extension.identifier, operation: 2 , source: extension, error, profileLocation: options.profileLocation ?? this.getCurrentExtensionsManifestLocation() });
             }
         }))));
         if (installableExtensions.length) {
@@ -115,7 +114,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 local = await this.copyExtension(extension, this.userDataProfilesService.defaultProfile.extensionsResource, fromProfileLocation);
             }
             for (const profile of this.userDataProfilesService.profiles) {
-                const existing = (await this.getInstalled(ExtensionType.User, profile.extensionsResource))
+                const existing = (await this.getInstalled(1 , profile.extensionsResource))
                     .find(e => areSameExtensions(e.identifier, extension.identifier));
                 if (existing) {
                     this._onDidUpdateExtensionMetadata.fire({ local: existing, profileLocation: profile.extensionsResource });
@@ -130,7 +129,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             const local = this.uriIdentityService.extUri.isEqual(fromProfileLocation, this.userDataProfilesService.defaultProfile.extensionsResource)
                 ? await this.updateMetadata(extension, { isApplicationScoped: true }, this.userDataProfilesService.defaultProfile.extensionsResource)
                 : await this.copyExtension(extension, fromProfileLocation, this.userDataProfilesService.defaultProfile.extensionsResource, { isApplicationScoped: true });
-            this._onDidInstallExtensions.fire([{ identifier: local.identifier, operation: InstallOperation.Install, local, profileLocation: this.userDataProfilesService.defaultProfile.extensionsResource, applicationScoped: true }]);
+            this._onDidInstallExtensions.fire([{ identifier: local.identifier, operation: 2 , local, profileLocation: this.userDataProfilesService.defaultProfile.extensionsResource, applicationScoped: true }]);
             return local;
         }
     }
@@ -148,7 +147,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     async resetPinnedStateForAllUserExtensions(pinned) {
         try {
             await this.joinAllSettled(( (this.userDataProfilesService.profiles.map(async (profile) => {
-                const extensions = await this.getInstalled(ExtensionType.User, profile.extensionsResource);
+                const extensions = await this.getInstalled(1 , profile.extensionsResource);
                 await this.joinAllSettled(( (extensions.map(async (extension) => {
                     if (extension.pinned !== pinned) {
                         await this.updateMetadata(extension, { pinned }, profile.extensionsResource);
@@ -167,6 +166,29 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const alreadyRequestedInstallations = [];
         const getInstallExtensionTaskKey = (extension, profileLocation) => `${( (ExtensionKey.create(extension).toString()))}-${( (profileLocation.toString()))}`;
         const createInstallExtensionTask = (manifest, extension, options, root) => {
+            if (!URI.isUri(extension)) {
+                if (( (installingExtensionsMap.has(
+                    `${extension.identifier.id.toLowerCase()}-${( (options.profileLocation.toString()))}`
+                )))) {
+                    return;
+                }
+                const existingInstallingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(extension, options.profileLocation));
+                if (existingInstallingExtension) {
+                    if (root && this.canWaitForTask(root, existingInstallingExtension.task)) {
+                        const identifier = existingInstallingExtension.task.identifier;
+                        this.logService.info('Waiting for already requested installing extension', identifier.id, root.identifier.id, ( (options.profileLocation.toString())));
+                        existingInstallingExtension.waitingTasks.push(root);
+                        alreadyRequestedInstallations.push(Event.toPromise(Event.filter(this.onDidInstallExtensions, results => ( (results.some(result => areSameExtensions(result.identifier, identifier)))))).then(results => {
+                            this.logService.info('Finished waiting for already requested installing extension', identifier.id, root.identifier.id, ( (options.profileLocation.toString())));
+                            const result = results.find(result => areSameExtensions(result.identifier, identifier));
+                            if (!result?.local) {
+                                throw ( (new Error(`Extension ${identifier.id} is not installed`)));
+                            }
+                        }));
+                    }
+                    return;
+                }
+            }
             const installExtensionTask = this.createInstallExtensionTask(manifest, extension, options);
             const key = `${getGalleryExtensionId(manifest.publisher, manifest.name)}-${( (options.profileLocation.toString()))}`;
             installingExtensionsMap.set(key, { task: installExtensionTask, root });
@@ -205,29 +227,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                         const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
                         const options = { ...task.options, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
                         for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
-                            if (( (installingExtensionsMap.has(
-                                `${gallery.identifier.id.toLowerCase()}-${( (options.profileLocation.toString()))}`
-                            )))) {
+                            if (( (installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))))) {
                                 continue;
                             }
-                            const existingInstallingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(gallery, options.profileLocation));
-                            if (existingInstallingExtension) {
-                                if (this.canWaitForTask(task, existingInstallingExtension.task)) {
-                                    const identifier = existingInstallingExtension.task.identifier;
-                                    this.logService.info('Waiting for already requested installing extension', identifier.id, task.identifier.id, ( (options.profileLocation.toString())));
-                                    existingInstallingExtension.waitingTasks.push(task);
-                                    alreadyRequestedInstallations.push(Event.toPromise(Event.filter(this.onDidInstallExtensions, results => ( (results.some(result => areSameExtensions(result.identifier, identifier)))))).then(results => {
-                                        this.logService.info('Finished waiting for already requested installing extension', identifier.id, task.identifier.id, ( (options.profileLocation.toString())));
-                                        const result = results.find(result => areSameExtensions(result.identifier, identifier));
-                                        if (!result?.local) {
-                                            throw ( (new Error(`Extension ${identifier.id} is not installed`)));
-                                        }
-                                    }));
-                                }
-                            }
-                            else if (!( (installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))))) {
-                                createInstallExtensionTask(manifest, gallery, options, task);
-                            }
+                            createInstallExtensionTask(manifest, gallery, options, task);
                         }
                     }
                     catch (error) {
@@ -246,6 +249,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     }
                 }
             }))));
+            const otherProfilesToUpdate = await this.getOtherProfilesToUpdateExtension(( ([...( (installingExtensionsMap.values()))].map(({ task }) => task))));
+            for (const [profileLocation, task] of otherProfilesToUpdate) {
+                createInstallExtensionTask(task.manifest, task.source, { ...task.options, profileLocation }, undefined);
+            }
             await this.joinAllSettled(( ([...installingExtensionsMap.entries()].map(async ([key, { task }]) => {
                 const startTime = ( (new Date())).getTime();
                 let local;
@@ -253,12 +260,12 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     local = await task.run();
                     await this.joinAllSettled(( (this.participants.map(
                         participant => participant.postInstall(local, task.source, task.options, CancellationToken.None)
-                    ))), ExtensionManagementErrorCode.PostInstall);
+                    ))), "PostInstall" );
                 }
                 catch (e) {
                     const error = toExtensionManagementError(e);
                     if (!URI.isUri(task.source)) {
-                        reportTelemetry(this.telemetryService, task.operation === InstallOperation.Update ? 'extensionGallery:update' : 'extensionGallery:install', {
+                        reportTelemetry(this.telemetryService, task.operation === 3  ? 'extensionGallery:update' : 'extensionGallery:install', {
                             extensionData: getGalleryExtensionTelemetryData(task.source),
                             error,
                             source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
@@ -269,7 +276,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     throw error;
                 }
                 if (!URI.isUri(task.source)) {
-                    const isUpdate = task.operation === InstallOperation.Update;
+                    const isUpdate = task.operation === 3 ;
                     const durationSinceUpdate = isUpdate ? undefined : (( (new Date())).getTime() - task.source.lastUpdated) / 1000;
                     reportTelemetry(this.telemetryService, isUpdate ? 'extensionGallery:update' : 'extensionGallery:install', {
                         extensionData: getGalleryExtensionTelemetryData(task.source),
@@ -278,9 +285,9 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                         durationSinceUpdate,
                         source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
                     });
-                    if (isWeb && task.operation !== InstallOperation.Update) {
+                    if (isWeb && task.operation !== 3 ) {
                         try {
-                            await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, StatisticType.Install);
+                            await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, "install" );
                         }
                         catch (error) {  }
                     }
@@ -313,7 +320,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 return allDepsOrPacks;
             };
-            const getErrorResult = (task) => ({ identifier: task.identifier, operation: InstallOperation.Install, source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, error });
+            const getErrorResult = (task) => ({ identifier: task.identifier, operation: 2 , source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, error });
             const rollbackTasks = [];
             for (const [key, { task, root }] of installingExtensionsMap) {
                 const result = installExtensionResultsMap.get(key);
@@ -372,6 +379,34 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
         }
     }
+    async getOtherProfilesToUpdateExtension(tasks) {
+        const otherProfilesToUpdate = [];
+        const profileExtensionsCache = ( (new ResourceMap()));
+        for (const task of tasks) {
+            if (task.operation !== 3
+                || task.options.isApplicationScoped
+                || task.options.pinned
+                || task.options.installGivenVersion
+                || URI.isUri(task.source)) {
+                continue;
+            }
+            for (const profile of this.userDataProfilesService.profiles) {
+                if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, task.options.profileLocation)) {
+                    continue;
+                }
+                let installedExtensions = profileExtensionsCache.get(profile.extensionsResource);
+                if (!installedExtensions) {
+                    installedExtensions = await this.getInstalled(1 , profile.extensionsResource);
+                    profileExtensionsCache.set(profile.extensionsResource, installedExtensions);
+                }
+                const installedExtension = installedExtensions.find(e => areSameExtensions(e.identifier, task.identifier));
+                if (installedExtension && !installedExtension.pinned) {
+                    otherProfilesToUpdate.push([profile.extensionsResource, task]);
+                }
+            }
+        }
+        return otherProfilesToUpdate;
+    }
     canWaitForTask(taskToWait, taskToWaitFor) {
         for (const [, { task, waitingTasks }] of this.installingExtensions.entries()) {
             if (task === taskToWait) {
@@ -406,11 +441,11 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (errors.length === 1) {
             throw errors[0];
         }
-        let error = ( (new ExtensionManagementError('', ExtensionManagementErrorCode.Unknown)));
+        let error = ( (new ExtensionManagementError('', "Unknown" )));
         for (const current of errors) {
             error = ( (new ExtensionManagementError(
                 error.message ? `${error.message}, ${current.message}` : current.message,
-                current.code !== ExtensionManagementErrorCode.Unknown && current.code !== ExtensionManagementErrorCode.Internal ? current.code : error.code
+                current.code !== "Unknown"  && current.code !== "Internal"  ? current.code : error.code
             )));
         }
         throw error;
@@ -472,10 +507,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (( (extensionsControlManifest.malicious.some(identifier => areSameExtensions(extension.identifier, identifier))))) {
             throw ( (new ExtensionManagementError(localize(
-                11163,
+                11276,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
-            ), ExtensionManagementErrorCode.Malicious)));
+            ), "Malicious" )));
         }
         const deprecationInfo = extensionsControlManifest.deprecated[extension.identifier.id.toLowerCase()];
         if (deprecationInfo?.extension?.autoMigrate) {
@@ -483,49 +518,49 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             compatibleExtension = (await this.galleryService.getExtensions([{ id: deprecationInfo.extension.id, preRelease: deprecationInfo.extension.preRelease }], { targetPlatform: await this.getTargetPlatform(), compatible: true, productVersion }, CancellationToken.None))[0];
             if (!compatibleExtension) {
                 throw ( (new ExtensionManagementError(localize(
-                    11164,
+                    11277,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
-                ), ExtensionManagementErrorCode.Deprecated)));
+                ), "Deprecated" )));
             }
         }
         else {
             if (!(await this.canInstall(extension))) {
                 const targetPlatform = await this.getTargetPlatform();
                 throw ( (new ExtensionManagementError(localize(
-                    11165,
+                    11278,
                     "The '{0}' extension is not available in {1} for {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
                     TargetPlatformToString(targetPlatform)
-                ), ExtensionManagementErrorCode.IncompatibleTargetPlatform)));
+                ), "IncompatibleTargetPlatform" )));
             }
             compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease, productVersion);
             if (!compatibleExtension) {
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( (new ExtensionManagementError(localize(
-                        11166,
+                        11279,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
-                    ), ExtensionManagementErrorCode.IncompatibleApi)));
+                    ), "IncompatibleApi" )));
                 }
                 if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
                     throw ( (new ExtensionManagementError(localize(
-                        11167,
+                        11280,
                         "Can't install release version of '{0}' extension because it has no release version.",
                         extension.displayName ?? extension.identifier.id
-                    ), ExtensionManagementErrorCode.ReleaseVersionNotFound)));
+                    ), "ReleaseVersionNotFound" )));
                 }
                 throw ( (new ExtensionManagementError(localize(
-                    11168,
+                    11281,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
                     this.productService.version
-                ), ExtensionManagementErrorCode.Incompatible)));
+                ), "Incompatible" )));
             }
         }
         this.logService.info('Getting Manifest...', compatibleExtension.identifier.id);
@@ -533,13 +568,13 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (manifest === null) {
             throw ( (new ExtensionManagementError(
                 `Missing manifest for extension ${compatibleExtension.identifier.id}`,
-                ExtensionManagementErrorCode.Invalid
+                "Invalid"
             )));
         }
         if (manifest.version !== compatibleExtension.version) {
             throw ( (new ExtensionManagementError(
                 `Cannot install '${compatibleExtension.identifier.id}' extension because of version mismatch in Marketplace`,
-                ExtensionManagementErrorCode.Invalid
+                "Invalid"
             )));
         }
         return { extension: compatibleExtension, manifest };
@@ -604,7 +639,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             for (const task of allTasks.slice(0)) {
                 let installed = installedExtensionsMap.get(task.options.profileLocation);
                 if (!installed) {
-                    installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
+                    installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(1 , task.options.profileLocation));
                 }
                 if (task.options.donotIncludePack) {
                     this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
@@ -635,7 +670,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     ))));
                     if (task.extension.identifier.uuid) {
                         try {
-                            await this.galleryService.reportStatistic(task.extension.manifest.publisher, task.extension.manifest.name, task.extension.manifest.version, StatisticType.Uninstall);
+                            await this.galleryService.reportStatistic(task.extension.manifest.publisher, task.extension.manifest.name, task.extension.manifest.version, "uninstall" );
                         }
                         catch (error) {  }
                     }
@@ -694,7 +729,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
                 return ( localize(
-                    11169,
+                    11282,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -702,7 +737,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             if (dependents.length === 2) {
                 return ( localize(
-                    11170,
+                    11283,
                     "Cannot uninstall '{0}' extension. '{1}' and '{2}' extensions depend on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -710,7 +745,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 ));
             }
             return ( localize(
-                11171,
+                11284,
                 "Cannot uninstall '{0}' extension. '{1}', '{2}' and other extension depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -719,7 +754,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 1) {
             return ( localize(
-                11172,
+                11285,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -729,7 +764,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 2) {
             return ( localize(
-                11173,
+                11286,
                 "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}' and '{3}' extensions depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -739,7 +774,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             ));
         }
         return ( localize(
-            11174,
+            11287,
             "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}', '{3}' and other extensions depend on this.",
             extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
             dependingExtension.manifest.displayName
@@ -794,41 +829,28 @@ function toExtensionManagementError(error, code) {
     if (error instanceof ExtensionGalleryError) {
         extensionManagementError = ( (new ExtensionManagementError(
             error.message,
-            error.code === ExtensionGalleryErrorCode.DownloadFailedWriting ? ExtensionManagementErrorCode.DownloadFailedWriting : ExtensionManagementErrorCode.Gallery
+            error.code === "DownloadFailedWriting"  ? "DownloadFailedWriting"  : "Gallery"
         )));
     }
     else {
         extensionManagementError = ( (new ExtensionManagementError(
             error.message,
-            isCancellationError(error) ? ExtensionManagementErrorCode.Cancelled : (code ?? ExtensionManagementErrorCode.Internal)
+            isCancellationError(error) ? "Cancelled"  : ((code ?? "Internal") )
         )));
     }
     extensionManagementError.stack = error.stack;
     return extensionManagementError;
 }
 function reportTelemetry(telemetryService, eventName, { extensionData, verificationStatus, duration, error, source, durationSinceUpdate }) {
-    let errorcode;
-    let errorcodeDetail;
-    if (isDefined(verificationStatus)) {
-        if (verificationStatus === true) {
-            verificationStatus = 'Verified';
-        }
-        else if (verificationStatus === false) {
-            verificationStatus = 'Unverified';
-        }
-        else {
-            errorcode = ExtensionManagementErrorCode.Signature;
-            errorcodeDetail = verificationStatus;
-            verificationStatus = 'Unverified';
-        }
-    }
-    if (error) {
-        errorcode = error.code;
-        if (error.code === ExtensionManagementErrorCode.Signature) {
-            errorcodeDetail = error.message;
-        }
-    }
-    telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate, source });
+    telemetryService.publicLog(eventName, {
+        ...extensionData,
+        source,
+        duration,
+        durationSinceUpdate,
+        success: !error,
+        errorcode: error?.code,
+        verificationStatus: verificationStatus === ExtensionSignatureVerificationCode.Success ? 'Verified' : (verificationStatus ?? 'Unverified')
+    });
 }
 class AbstractExtensionTask {
     constructor() {

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.js

@@ -9,9 +9,8 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { isOfflineError } from 'vscode/vscode/vs/base/parts/request/common/request';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
-import { getTargetPlatform, SortBy, SortOrder, toTargetPlatform, WEB_EXTENSION_TAG, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, StatisticType, InstallOperation } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { getTargetPlatform, toTargetPlatform, WEB_EXTENSION_TAG, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryError } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { adoptToGalleryExtensionId, getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { TargetPlatform } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { isEngineValid, areApiProposalsCompatible } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -23,7 +22,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 
-const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
+const CURRENT_TARGET_PLATFORM = isWeb ? "web"  : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
 var Flags;
 ( (function(Flags) {
@@ -81,8 +80,8 @@ const DefaultPageSize = 10;
 const DefaultQueryState = {
     pageNumber: 1,
     pageSize: DefaultPageSize,
-    sortBy: SortBy.NoneOrRelevance,
-    sortOrder: SortOrder.Default,
+    sortBy: 0 ,
+    sortOrder: 0 ,
     flags: Flags.None,
     criteria: [],
     assetTypes: []
@@ -217,15 +216,15 @@ function getIsPreview(flags) {
     return flags.indexOf('preview') !== -1;
 }
 function getTargetPlatformForExtensionVersion(version) {
-    return version.targetPlatform ? toTargetPlatform(version.targetPlatform) : TargetPlatform.UNDEFINED;
+    return version.targetPlatform ? toTargetPlatform(version.targetPlatform) : "undefined" ;
 }
 function getAllTargetPlatforms(rawGalleryExtension) {
     const allTargetPlatforms = distinct(( rawGalleryExtension.versions.map(getTargetPlatformForExtensionVersion)));
     const isWebExtension = !!rawGalleryExtension.tags?.includes(WEB_EXTENSION_TAG);
-    const webTargetPlatformIndex = allTargetPlatforms.indexOf(TargetPlatform.WEB);
+    const webTargetPlatformIndex = allTargetPlatforms.indexOf("web" );
     if (isWebExtension) {
         if (webTargetPlatformIndex === -1) {
-            allTargetPlatforms.push(TargetPlatform.WEB);
+            allTargetPlatforms.push("web" );
         }
     }
     else {
@@ -485,7 +484,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 text = text.length < 200 ? text : text.substring(0, 200);
                 query = query.withFilter(FilterType.SearchText, text);
             }
-            query = query.withSortBy(SortBy.NoneOrRelevance);
+            query = query.withSortBy(0 );
         }
         else if (options.ids) {
             query = query.withFilter(FilterType.ExtensionId, ...options.ids);
@@ -494,7 +493,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             query = query.withFilter(FilterType.ExtensionName, ...options.names);
         }
         else {
-            query = query.withSortBy(SortBy.InstallCount);
+            query = query.withSortBy(4 );
         }
         if (typeof options.sortBy === 'number') {
             query = query.withSortBy(options.sortBy);
@@ -657,16 +656,16 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         catch (e) {
             if (isCancellationError(e)) {
-                errorCode = ExtensionGalleryErrorCode.Cancelled;
+                errorCode = "Cancelled" ;
                 throw e;
             }
             else {
                 const errorMessage = getErrorMessage(e);
                 errorCode = isOfflineError(e)
-                    ? ExtensionGalleryErrorCode.Offline
+                    ? "Offline"
                     : errorMessage.startsWith('XHR timeout')
-                        ? ExtensionGalleryErrorCode.Timeout
-                        : ExtensionGalleryErrorCode.Failed;
+                        ? "Timeout"
+                        : "Failed" ;
                 throw ( new ExtensionGalleryError(errorMessage, errorCode));
             }
         }
@@ -687,7 +686,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         if (!this.isEnabled()) {
             return undefined;
         }
-        const url = isWeb ? this.api(`/itemName/${publisher}.${name}/version/${version}/statType/${type === StatisticType.Install ? '1' : '3'}/vscodewebextension`) : this.api(`/publishers/${publisher}/extensions/${name}/${version}/stats?statType=${type}`);
+        const url = isWeb ? this.api(`/itemName/${publisher}.${name}/version/${version}/statType/${type === "install"  ? '1' : '3'}/vscodewebextension`) : this.api(`/publishers/${publisher}/extensions/${name}/${version}/stats?statType=${type}`);
         const Accept = isWeb ? 'api-version=6.1-preview.1' : '*/*;api-version=4.0-preview.1';
         const commonHeaders = await this.commonHeadersPromise;
         const headers = { ...commonHeaders, Accept };
@@ -704,7 +703,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         this.logService.trace('ExtensionGalleryService#download', extension.identifier.id);
         const data = getGalleryExtensionTelemetryData(extension);
         const startTime = ( new Date()).getTime();
-        const operationParam = operation === InstallOperation.Install ? 'install' : operation === InstallOperation.Update ? 'update' : '';
+        const operationParam = operation === 2  ? 'install' : operation === 3  ? 'update' : '';
         const downloadAsset = operationParam ? {
             uri: `${extension.assets.download.uri}${( URI.parse(extension.assets.download.uri)).query ? '&' : '?'}${operationParam}=true`,
             fallbackUri: `${extension.assets.download.fallbackUri}${( URI.parse(extension.assets.download.fallbackUri)).query ? '&' : '?'}${operationParam}=true`
@@ -721,7 +720,10 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             catch (e) {
                 this.logService.warn(`Error while deleting the file ${( location.toString())}`, getErrorMessage(e));
             }
-            throw ( new ExtensionGalleryError(getErrorMessage(error), ExtensionGalleryErrorCode.DownloadFailedWriting));
+            throw ( new ExtensionGalleryError(
+                getErrorMessage(error),
+                "DownloadFailedWriting"
+            ));
         }
         this.telemetryService.publicLog('galleryService:downloadVSIX', { ...data, duration: ( new Date()).getTime() - startTime });
     }
@@ -741,7 +743,10 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             catch (e) {
                 this.logService.warn(`Error while deleting the file ${( location.toString())}`, getErrorMessage(e));
             }
-            throw ( new ExtensionGalleryError(getErrorMessage(error), ExtensionGalleryErrorCode.DownloadFailedWriting));
+            throw ( new ExtensionGalleryError(
+                getErrorMessage(error),
+                "DownloadFailedWriting"
+            ));
         }
     }
     async getReadme(extension, token) {