@codingame/monaco-vscode-extension-gallery-service-override 7.1.0 → 8.0.0

package/extensionGallery.js

@@ -42,6 +42,7 @@ import { getExtensionManifests } from 'vscode/extensions';
 import { isLocaleAvailable } from 'vscode/l10n';
 import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.js';
 import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js';
+import { unsupported } from './tools.js';
 
 registerAssets({
     'vs/workbench/services/extensionManagement/common/media/defaultIcon.png': ( new URL('./assets/defaultIcon.png', import.meta.url).toString()),
@@ -50,6 +51,7 @@ registerAssets({
 });
 class EmptyRemoteAgentService {
     constructor() {
+        this.endConnection = unsupported;
         this.getConnection = () => null;
         this.getEnvironment = async () => null;
         this.getRawEnvironment = async () => null;

package/package.json

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

package/tools.js

@@ -0,0 +1,42 @@
+function unsupported() {
+    throw new Error('unsupported');
+}
+function memoized(fct) {
+    let v = null;
+    return (...args) => {
+        if (v == null) {
+            v = fct(...args);
+        }
+        return v;
+    };
+}
+function memoizedConstructor(ctor) {
+    return new Proxy(ctor, {
+        construct: memoized((target, args) => {
+            return Reflect.construct(ctor, args);
+        })
+    });
+}
+async function sleep(duration) {
+    await new Promise(resolve => setTimeout(resolve, duration));
+}
+function throttle(fct, merge, delay) {
+    let lastPromise = Promise.resolve();
+    let toConsume = null;
+    return async (param) => {
+        if (toConsume == null) {
+            toConsume = param;
+            lastPromise = lastPromise.then(async () => sleep(delay)).then(async () => {
+                const _toConsume = toConsume;
+                toConsume = null;
+                await fct(_toConsume);
+            });
+        }
+        else {
+            toConsume = merge(toConsume, param);
+        }
+        await lastPromise;
+    };
+}
+
+export { memoized, memoizedConstructor, sleep, throttle, unsupported };

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

@@ -5,10 +5,11 @@ import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { getErrorMessage, isCancellationError, CancellationError } from 'vscode/vscode/vs/base/common/errors';
 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions, ExtensionKey, getGalleryExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -20,7 +21,6 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 
-const _moduleId = "vs/platform/extensionManagement/common/abstractExtensionManagementService";
 let AbstractExtensionManagementService = class AbstractExtensionManagementService extends Disposable {
     get onInstallExtension() { return this._onInstallExtension.event; }
     get onDidInstallExtensions() { return this._onDidInstallExtensions.event; }
@@ -81,7 +81,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
             throw ( (new ExtensionManagementError(
-                localizeWithPath(_moduleId, 0, "Marketplace is not enabled"),
+                localize(11109, "Marketplace is not enabled"),
                 ExtensionManagementErrorCode.NotAllowed
             )));
         }
@@ -101,9 +101,9 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         return results;
     }
-    async uninstall(extension, options = {}) {
+    async uninstall(extension, options) {
         this.logService.trace('ExtensionManagementService#uninstall', extension.identifier.id);
-        return this.uninstallExtension(extension, options);
+        return this.uninstallExtensions([{ extension, options }]);
     }
     async toggleAppliationScope(extension, fromProfileLocation) {
         if (isApplicationScopedExtension(extension.manifest) || extension.isBuiltin) {
@@ -145,6 +145,22 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     registerParticipant(participant) {
         this.participants.push(participant);
     }
+    async resetPinnedStateForAllUserExtensions(pinned) {
+        try {
+            await this.joinAllSettled(( (this.userDataProfilesService.profiles.map(async (profile) => {
+                const extensions = await this.getInstalled(ExtensionType.User, profile.extensionsResource);
+                await this.joinAllSettled(( (extensions.map(async (extension) => {
+                    if (extension.pinned !== pinned) {
+                        await this.updateMetadata(extension, { pinned }, profile.extensionsResource);
+                    }
+                }))));
+            }))));
+        }
+        catch (error) {
+            this.logService.error('Error while resetting pinned state for all user extensions', getErrorMessage(error));
+            throw error;
+        }
+    }
     async installExtensions(extensions) {
         const installExtensionResultsMap = ( (new Map()));
         const installingExtensionsMap = ( (new Map()));
@@ -455,9 +471,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         let compatibleExtension;
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (( (extensionsControlManifest.malicious.some(identifier => areSameExtensions(extension.identifier, identifier))))) {
-            throw ( (new ExtensionManagementError(localizeWithPath(
-                _moduleId,
-                1,
+            throw ( (new ExtensionManagementError(localize(
+                11110,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
             ), ExtensionManagementErrorCode.Malicious)));
@@ -467,9 +482,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             this.logService.info(`The '${extension.identifier.id}' extension is deprecated, fetching the compatible '${deprecationInfo.extension.id}' extension instead.`);
             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(localizeWithPath(
-                    _moduleId,
-                    2,
+                throw ( (new ExtensionManagementError(localize(
+                    11111,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
@@ -479,9 +493,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         else {
             if (!(await this.canInstall(extension))) {
                 const targetPlatform = await this.getTargetPlatform();
-                throw ( (new ExtensionManagementError(localizeWithPath(
-                    _moduleId,
-                    3,
+                throw ( (new ExtensionManagementError(localize(
+                    11112,
                     "The '{0}' extension is not available in {1} for {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -492,25 +505,22 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (!compatibleExtension) {
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
-                    throw ( (new ExtensionManagementError(localizeWithPath(
-                        _moduleId,
-                        4,
+                    throw ( (new ExtensionManagementError(localize(
+                        11113,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
                     ), ExtensionManagementErrorCode.IncompatibleApi)));
                 }
                 if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
-                    throw ( (new ExtensionManagementError(localizeWithPath(
-                        _moduleId,
-                        5,
+                    throw ( (new ExtensionManagementError(localize(
+                        11114,
                         "Can't install release version of '{0}' extension because it has no release version.",
                         extension.displayName ?? extension.identifier.id
                     ), ExtensionManagementErrorCode.ReleaseVersionNotFound)));
                 }
-                throw ( (new ExtensionManagementError(localizeWithPath(
-                    _moduleId,
-                    6,
+                throw ( (new ExtensionManagementError(localize(
+                    11115,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -553,79 +563,75 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         return compatibleExtension;
     }
-    async uninstallExtension(extension, options) {
-        const uninstallOptions = {
-            ...options,
-            profileLocation: extension.isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation()
-        };
-        const getUninstallExtensionTaskKey = (identifier) => `${identifier.id.toLowerCase()}${uninstallOptions.versionOnly ? `-${extension.manifest.version}` : ''}${uninstallOptions.profileLocation ? `@${( (uninstallOptions.profileLocation.toString()))}` : ''}`;
-        const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(extension.identifier));
-        if (uninstallExtensionTask) {
-            this.logService.info('Extensions is already requested to uninstall', extension.identifier.id);
-            return uninstallExtensionTask.waitUntilTaskIsFinished();
-        }
-        const createUninstallExtensionTask = (extension) => {
+    async uninstallExtensions(extensions) {
+        const getUninstallExtensionTaskKey = (extension, uninstallOptions) => `${extension.identifier.id.toLowerCase()}${uninstallOptions.versionOnly ? `-${extension.manifest.version}` : ''}@${( (uninstallOptions.profileLocation.toString()))}`;
+        const createUninstallExtensionTask = (extension, uninstallOptions) => {
             const uninstallExtensionTask = this.createUninstallExtensionTask(extension, uninstallOptions);
-            this.uninstallingExtensions.set(getUninstallExtensionTaskKey(uninstallExtensionTask.extension.identifier), uninstallExtensionTask);
-            if (uninstallOptions.profileLocation) {
-                this.logService.info('Uninstalling extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())));
-            }
-            else {
-                this.logService.info('Uninstalling extension:', `${extension.identifier.id}@${extension.manifest.version}`);
-            }
+            this.uninstallingExtensions.set(getUninstallExtensionTaskKey(uninstallExtensionTask.extension, uninstallOptions), uninstallExtensionTask);
+            this.logService.info('Uninstalling extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())));
             this._onUninstallExtension.fire({ identifier: extension.identifier, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
             return uninstallExtensionTask;
         };
-        const postUninstallExtension = (extension, error) => {
+        const postUninstallExtension = (extension, uninstallOptions, error) => {
             if (error) {
-                if (uninstallOptions.profileLocation) {
-                    this.logService.error('Failed to uninstall extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())), error.message);
-                }
-                else {
-                    this.logService.error('Failed to uninstall extension:', `${extension.identifier.id}@${extension.manifest.version}`, error.message);
-                }
+                this.logService.error('Failed to uninstall extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())), error.message);
             }
             else {
-                if (uninstallOptions.profileLocation) {
-                    this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())));
-                }
-                else {
-                    this.logService.info('Successfully uninstalled extension:', `${extension.identifier.id}@${extension.manifest.version}`);
-                }
+                this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, ( (uninstallOptions.profileLocation.toString())));
             }
             reportTelemetry(this.telemetryService, 'extensionGallery:uninstall', { extensionData: getLocalExtensionTelemetryData(extension), error });
             this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
         };
         const allTasks = [];
         const processedTasks = [];
-        try {
-            allTasks.push(createUninstallExtensionTask(extension));
-            const installed = await this.getInstalled(ExtensionType.User, uninstallOptions.profileLocation);
-            if (uninstallOptions.donotIncludePack) {
-                this.logService.info('Uninstalling the extension without including packed extension', `${extension.identifier.id}@${extension.manifest.version}`);
+        const alreadyRequestedUninstalls = [];
+        const installedExtensionsMap = ( (new ResourceMap()));
+        for (const { extension, options } of extensions) {
+            const uninstallOptions = {
+                ...options,
+                profileLocation: extension.isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options?.profileLocation ?? this.getCurrentExtensionsManifestLocation()
+            };
+            const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(extension, uninstallOptions));
+            if (uninstallExtensionTask) {
+                this.logService.info('Extensions is already requested to uninstall', extension.identifier.id);
+                alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
             }
             else {
-                const packedExtensions = this.getAllPackExtensionsToUninstall(extension, installed);
-                for (const packedExtension of packedExtensions) {
-                    if (( (this.uninstallingExtensions.has(getUninstallExtensionTaskKey(packedExtension.identifier))))) {
-                        this.logService.info('Extensions is already requested to uninstall', packedExtension.identifier.id);
-                    }
-                    else {
-                        allTasks.push(createUninstallExtensionTask(packedExtension));
+                allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
+            }
+        }
+        try {
+            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));
+                }
+                if (task.options.donotIncludePack) {
+                    this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
+                }
+                else {
+                    const packedExtensions = this.getAllPackExtensionsToUninstall(task.extension, installed);
+                    for (const packedExtension of packedExtensions) {
+                        if (( (this.uninstallingExtensions.has(getUninstallExtensionTaskKey(packedExtension, task.options))))) {
+                            this.logService.info('Extensions is already requested to uninstall', packedExtension.identifier.id);
+                        }
+                        else {
+                            allTasks.push(createUninstallExtensionTask(packedExtension, task.options));
+                        }
                     }
                 }
-            }
-            if (uninstallOptions.donotCheckDependents) {
-                this.logService.info('Uninstalling the extension without checking dependents', `${extension.identifier.id}@${extension.manifest.version}`);
-            }
-            else {
-                this.checkForDependents(( (allTasks.map(task => task.extension))), installed, extension);
+                if (task.options.donotCheckDependents) {
+                    this.logService.info('Uninstalling the extension without checking dependents', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
+                }
+                else {
+                    this.checkForDependents(( (allTasks.map(task => task.extension))), installed, task.extension);
+                }
             }
             await this.joinAllSettled(( (allTasks.map(async (task) => {
                 try {
                     await task.run();
                     await this.joinAllSettled(( (this.participants.map(
-                        participant => participant.postUninstall(task.extension, uninstallOptions, CancellationToken.None)
+                        participant => participant.postUninstall(task.extension, task.options, CancellationToken.None)
                     ))));
                     if (task.extension.identifier.uuid) {
                         try {
@@ -633,17 +639,22 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                         }
                         catch (error) {  }
                     }
-                    postUninstallExtension(task.extension);
                 }
                 catch (e) {
                     const error = toExtensionManagementError(e);
-                    postUninstallExtension(task.extension, error);
+                    postUninstallExtension(task.extension, task.options, error);
                     throw error;
                 }
                 finally {
                     processedTasks.push(task);
                 }
             }))));
+            if (alreadyRequestedUninstalls.length) {
+                await this.joinAllSettled(alreadyRequestedUninstalls);
+            }
+            for (const task of allTasks) {
+                postUninstallExtension(task.extension, task.options);
+            }
         }
         catch (e) {
             const error = toExtensionManagementError(e);
@@ -653,14 +664,14 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 catch (error) {  }
                 if (!processedTasks.includes(task)) {
-                    postUninstallExtension(task.extension, error);
+                    postUninstallExtension(task.extension, task.options, error);
                 }
             }
             throw error;
         }
         finally {
             for (const task of allTasks) {
-                if (!this.uninstallingExtensions.delete(getUninstallExtensionTaskKey(task.extension.identifier))) {
+                if (!this.uninstallingExtensions.delete(getUninstallExtensionTaskKey(task.extension, task.options))) {
                     this.logService.warn('Uninstallation task is not found in the cache', task.extension.identifier.id);
                 }
             }
@@ -682,27 +693,24 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     getDependentsErrorMessage(dependingExtension, dependents, extensionToUninstall) {
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    7,
+                return ( localize(
+                    11116,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
                 ));
             }
             if (dependents.length === 2) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    8,
+                return ( localize(
+                    11117,
                     "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,
                     dependents[1].manifest.displayName || dependents[1].manifest.name
                 ));
             }
-            return ( localizeWithPath(
-                _moduleId,
-                9,
+            return ( localize(
+                11118,
                 "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,
@@ -710,9 +718,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             ));
         }
         if (dependents.length === 1) {
-            return ( localizeWithPath(
-                _moduleId,
-                10,
+            return ( localize(
+                11119,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -721,9 +728,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             ));
         }
         if (dependents.length === 2) {
-            return ( localizeWithPath(
-                _moduleId,
-                11,
+            return ( localize(
+                11120,
                 "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
@@ -732,9 +738,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 dependents[1].manifest.displayName || dependents[1].manifest.name
             ));
         }
-        return ( localizeWithPath(
-            _moduleId,
-            12,
+        return ( localize(
+            11121,
             "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

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

@@ -74,6 +74,7 @@ const PropertyType = {
     WebExtension: 'Microsoft.VisualStudio.Code.WebExtension',
     SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
     SupportLink: 'Microsoft.VisualStudio.Services.Links.Support',
+    ExecutesCode: 'Microsoft.VisualStudio.Code.ExecutesCode',
 };
 const DefaultPageSize = 10;
 const DefaultQueryState = {
@@ -191,6 +192,10 @@ function isPreReleaseVersion(version) {
     const values = version.properties ? version.properties.filter(p => p.key === PropertyType.PreRelease) : [];
     return values.length > 0 && values[0].value === 'true';
 }
+function executesCode(version) {
+    const values = version.properties ? version.properties.filter(p => p.key === PropertyType.ExecutesCode) : [];
+    return values.length > 0 ? values[0].value === 'true' : undefined;
+}
 function getEnabledApiProposals(version) {
     const values = version.properties ? version.properties.filter(p => p.key === PropertyType.EnabledApiProposals) : [];
     const value = (values.length > 0 && values[0].value) || '';
@@ -295,7 +300,8 @@ function toExtension(galleryExtension, version, allTargetPlatforms, queryContext
             enabledApiProposals: getEnabledApiProposals(version),
             localizedLanguages: getLocalizedLanguages(version),
             targetPlatform: getTargetPlatformForExtensionVersion(version),
-            isPreReleaseVersion: isPreReleaseVersion(version)
+            isPreReleaseVersion: isPreReleaseVersion(version),
+            executesCode: executesCode(version)
         },
         hasPreReleaseVersion: isPreReleaseVersion(latestVersion),
         hasReleaseVersion: true,
@@ -623,9 +629,9 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 return {
                     galleryExtensions,
                     total,
-                    context: {
+                    context: context.res.headers['activityid'] ? {
                         [ACTIVITY_HEADER_NAME]: context.res.headers['activityid']
-                    }
+                    } : {}
                 };
             }
             return { galleryExtensions: [], total };

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

@@ -57,9 +57,6 @@ class ExtensionManagementChannelClient extends Disposable {
     zip(extension) {
         return Promise.resolve(this.channel.call('zip', [extension]).then(result => URI.revive(result)));
     }
-    unzip(zipLocation) {
-        return Promise.resolve(this.channel.call('unzip', [zipLocation]));
-    }
     install(vsix, options) {
         return Promise.resolve(this.channel.call('install', [vsix, options])).then(local => transformIncomingExtension(local, null));
     }
@@ -88,6 +85,12 @@ class ExtensionManagementChannelClient extends Disposable {
         }
         return Promise.resolve(this.channel.call('uninstall', [extension, options]));
     }
+    uninstallExtensions(extensions) {
+        if (( extensions.some(e => e.extension.isWorkspaceScoped))) {
+            throw ( new Error('Cannot uninstall a workspace extension'));
+        }
+        return Promise.resolve(this.channel.call('uninstallExtensions', [extensions]));
+    }
     reinstallFromGallery(extension) {
         return Promise.resolve(this.channel.call('reinstallFromGallery', [extension])).then(local => transformIncomingExtension(local, null));
     }
@@ -99,6 +102,9 @@ class ExtensionManagementChannelClient extends Disposable {
         return Promise.resolve(this.channel.call('updateMetadata', [local, metadata, extensionsProfileResource]))
             .then(extension => transformIncomingExtension(extension, null));
     }
+    resetPinnedStateForAllUserExtensions(pinned) {
+        return this.channel.call('resetPinnedStateForAllUserExtensions', [pinned]);
+    }
     toggleAppliationScope(local, fromProfileLocation) {
         return this.channel.call('toggleAppliationScope', [local, fromProfileLocation])
             .then(extension => transformIncomingExtension(extension, null));