@codingame/monaco-vscode-extension-gallery-service-override 5.3.0 → 6.0.1

package/package.json

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

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

@@ -9,10 +9,10 @@ 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 { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_DEP_PACK_CONTEXT, TargetPlatformToString, ExtensionGalleryError } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+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';
-import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { isApplicationScopedExtension, ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -92,7 +92,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 installableExtensions.push({ ...compatible, options });
             }
             catch (error) {
-                results.push({ identifier: extension.identifier, operation: 2 , source: extension, error });
+                results.push({ identifier: extension.identifier, operation: InstallOperation.Install, source: extension, error });
             }
         }))));
         if (installableExtensions.length) {
@@ -114,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(1 , profile.extensionsResource))
+                const existing = (await this.getInstalled(ExtensionType.User, profile.extensionsResource))
                     .find(e => areSameExtensions(e.identifier, extension.identifier));
                 if (existing) {
                     this._onDidUpdateExtensionMetadata.fire(existing);
@@ -129,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: 2 , local, profileLocation: this.userDataProfilesService.defaultProfile.extensionsResource, applicationScoped: true }]);
+            this._onDidInstallExtensions.fire([{ identifier: local.identifier, operation: InstallOperation.Install, local, profileLocation: this.userDataProfilesService.defaultProfile.extensionsResource, applicationScoped: true }]);
             return local;
         }
     }
@@ -154,7 +154,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             const key = `${getGalleryExtensionId(manifest.publisher, manifest.name)}-${( (options.profileLocation.toString()))}`;
             installingExtensionsMap.set(key, { task: installExtensionTask, root });
             this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: options.profileLocation });
-            this.logService.info('Installing extension:', installExtensionTask.identifier.id);
+            this.logService.info('Installing extension:', installExtensionTask.identifier.id, ( (options.profileLocation.toString())));
             if (!URI.isUri(extension)) {
                 this.installingExtensions.set(getInstallExtensionTaskKey(extension, options.profileLocation), { task: installExtensionTask, waitingTasks: [] });
             }
@@ -171,7 +171,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 };
                 const existingInstallExtensionTask = !URI.isUri(extension) ? this.installingExtensions.get(getInstallExtensionTaskKey(extension, installExtensionTaskOptions.profileLocation)) : undefined;
                 if (existingInstallExtensionTask) {
-                    this.logService.info('Extension is already requested to install', existingInstallExtensionTask.task.identifier.id);
+                    this.logService.info('Extension is already requested to install', existingInstallExtensionTask.task.identifier.id, ( (installExtensionTaskOptions.profileLocation.toString())));
                     alreadyRequestedInstallations.push(existingInstallExtensionTask.task.waitUntilTaskIsFinished());
                 }
                 else {
@@ -197,10 +197,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                             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);
+                                    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);
+                                        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`)));
@@ -231,38 +231,44 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }))));
             await this.joinAllSettled(( ([...installingExtensionsMap.entries()].map(async ([key, { task }]) => {
                 const startTime = ( (new Date())).getTime();
+                let local;
                 try {
-                    const local = await task.run();
+                    local = await task.run();
                     await this.joinAllSettled(( (this.participants.map(
                         participant => participant.postInstall(local, task.source, task.options, CancellationToken.None)
-                    ))));
-                    if (!URI.isUri(task.source)) {
-                        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),
-                            verificationStatus: task.verificationStatus,
-                            duration: ( (new Date())).getTime() - startTime,
-                            durationSinceUpdate
-                        });
-                        if (isWeb && task.operation !== 3 ) {
-                            try {
-                                await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, "install" );
-                            }
-                            catch (error) {  }
-                        }
-                    }
-                    installExtensionResultsMap.set(key, { local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
+                    ))), ExtensionManagementErrorCode.PostInstall);
                 }
                 catch (e) {
                     const error = toExtensionManagementError(e);
                     if (!URI.isUri(task.source)) {
-                        reportTelemetry(this.telemetryService, task.operation === 3  ? 'extensionGallery:update' : 'extensionGallery:install', { extensionData: getGalleryExtensionTelemetryData(task.source), error });
+                        reportTelemetry(this.telemetryService, task.operation === InstallOperation.Update ? 'extensionGallery:update' : 'extensionGallery:install', {
+                            extensionData: getGalleryExtensionTelemetryData(task.source),
+                            error,
+                            source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
+                        });
                     }
-                    installExtensionResultsMap.set(key, { error, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: task.options.isApplicationScoped });
-                    this.logService.error('Error while installing the extension', task.identifier.id, getErrorMessage(error));
+                    installExtensionResultsMap.set(key, { error, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, applicationScoped: task.options.isApplicationScoped });
+                    this.logService.error('Error while installing the extension', task.identifier.id, getErrorMessage(error), ( (task.options.profileLocation.toString())));
                     throw error;
                 }
+                if (!URI.isUri(task.source)) {
+                    const isUpdate = task.operation === InstallOperation.Update;
+                    const durationSinceUpdate = isUpdate ? undefined : (( (new Date())).getTime() - task.source.lastUpdated) / 1000;
+                    reportTelemetry(this.telemetryService, isUpdate ? 'extensionGallery:update' : 'extensionGallery:install', {
+                        extensionData: getGalleryExtensionTelemetryData(task.source),
+                        verificationStatus: task.verificationStatus,
+                        duration: ( (new Date())).getTime() - startTime,
+                        durationSinceUpdate,
+                        source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
+                    });
+                    if (isWeb && task.operation !== InstallOperation.Update) {
+                        try {
+                            await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, StatisticType.Install);
+                        }
+                        catch (error) {  }
+                    }
+                }
+                installExtensionResultsMap.set(key, { local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, applicationScoped: local.isApplicationScoped });
             }))));
             if (alreadyRequestedInstallations.length) {
                 await this.joinAllSettled(alreadyRequestedInstallations);
@@ -290,7 +296,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 return allDepsOrPacks;
             };
-            const getErrorResult = (task) => ({ identifier: task.identifier, operation: 2 , source: task.source, context: task.options.context, profileLocation: task.profileLocation, error });
+            const getErrorResult = (task) => ({ identifier: task.identifier, operation: InstallOperation.Install, 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);
@@ -298,8 +304,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     task.cancel();
                     installExtensionResultsMap.set(key, getErrorResult(task));
                 }
-                else if (result.local && root && !installExtensionResultsMap.get(`${root.identifier.id.toLowerCase()}-${( (task.profileLocation.toString()))}`)?.local) {
-                    rollbackTasks.push(this.createUninstallExtensionTask(result.local, { versionOnly: true, profileLocation: task.profileLocation }));
+                else if (result.local && root && !installExtensionResultsMap.get(`${root.identifier.id.toLowerCase()}-${( (task.options.profileLocation.toString()))}`)?.local) {
+                    rollbackTasks.push(this.createUninstallExtensionTask(result.local, { versionOnly: true, profileLocation: task.options.profileLocation }));
                     installExtensionResultsMap.set(key, getErrorResult(task));
                 }
             }
@@ -311,11 +317,11 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 if (task.options.donotIncludePackAndDependencies) {
                     continue;
                 }
-                const depsOrPacks = getAllDepsAndPacks(result.local, task.profileLocation, [result.local.identifier.id.toLowerCase()]).slice(1);
+                const depsOrPacks = getAllDepsAndPacks(result.local, task.options.profileLocation, [result.local.identifier.id.toLowerCase()]).slice(1);
                 if (( (depsOrPacks.some(depOrPack => ( (installingExtensionsMap.has(
-                    `${depOrPack.toLowerCase()}-${( (task.profileLocation.toString()))}`
-                ))) && !installExtensionResultsMap.get(`${depOrPack.toLowerCase()}-${( (task.profileLocation.toString()))}`)?.local)))) {
-                    rollbackTasks.push(this.createUninstallExtensionTask(result.local, { versionOnly: true, profileLocation: task.profileLocation }));
+                    `${depOrPack.toLowerCase()}-${( (task.options.profileLocation.toString()))}`
+                ))) && !installExtensionResultsMap.get(`${depOrPack.toLowerCase()}-${( (task.options.profileLocation.toString()))}`)?.local)))) {
+                    rollbackTasks.push(this.createUninstallExtensionTask(result.local, { versionOnly: true, profileLocation: task.options.profileLocation }));
                     installExtensionResultsMap.set(key, getErrorResult(task));
                 }
             }
@@ -335,14 +341,14 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         finally {
             for (const { task } of ( (installingExtensionsMap.values()))) {
                 if (task.source && !URI.isUri(task.source)) {
-                    this.installingExtensions.delete(getInstallExtensionTaskKey(task.source, task.profileLocation));
+                    this.installingExtensions.delete(getInstallExtensionTaskKey(task.source, task.options.profileLocation));
                 }
             }
             if (installExtensionResultsMap.size) {
                 const results = [...( (installExtensionResultsMap.values()))];
                 for (const result of results) {
                     if (result.local) {
-                        this.logService.info(`Extension installed successfully:`, result.identifier.id);
+                        this.logService.info(`Extension installed successfully:`, result.identifier.id, ( (result.profileLocation.toString())));
                     }
                 }
                 this._onDidInstallExtensions.fire(results);
@@ -365,7 +371,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         return true;
     }
-    async joinAllSettled(promises) {
+    async joinAllSettled(promises, errorCode) {
         const results = [];
         const errors = [];
         const promiseResults = await Promise.allSettled(promises);
@@ -374,24 +380,23 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 results.push(r.value);
             }
             else {
-                errors.push(r.reason);
+                errors.push(toExtensionManagementError(r.reason, errorCode));
             }
         }
-        if (errors.length) {
-            if (errors.length === 1) {
-                throw errors[0];
-            }
-            let error = ( (new ExtensionManagementError('', ExtensionManagementErrorCode.Unknown)));
-            for (const current of errors) {
-                const code = current instanceof ExtensionManagementError ? current.code : ExtensionManagementErrorCode.Unknown;
-                error = ( (new ExtensionManagementError(
-                    current.message ? `${current.message}, ${error.message}` : error.message,
-                    code !== ExtensionManagementErrorCode.Unknown && code !== ExtensionManagementErrorCode.Internal ? code : error.code
-                )));
-            }
-            throw error;
+        if (!errors.length) {
+            return results;
         }
-        return results;
+        if (errors.length === 1) {
+            throw errors[0];
+        }
+        let error = ( (new ExtensionManagementError('', ExtensionManagementErrorCode.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
+            )));
+        }
+        throw error;
     }
     async getAllDepsAndPackExtensions(extensionIdentifier, manifest, getOnlyNewlyAddedFromExtensionPack, installPreRelease, profile, productVersion) {
         if (!this.galleryService.isEnabled()) {
@@ -584,7 +589,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const processedTasks = [];
         try {
             allTasks.push(createUninstallExtensionTask(extension));
-            const installed = await this.getInstalled(1 , uninstallOptions.profileLocation);
+            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}`);
             }
@@ -613,7 +618,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, "uninstall" );
+                            await this.galleryService.reportStatistic(task.extension.manifest.publisher, task.extension.manifest.name, task.extension.manifest.version, StatisticType.Uninstall);
                         }
                         catch (error) {  }
                     }
@@ -765,23 +770,27 @@ AbstractExtensionManagementService = ( (__decorate([
     ( (__param(4, IProductService))),
     ( (__param(5, IUserDataProfilesService)))
 ], AbstractExtensionManagementService)));
-function toExtensionManagementError(error) {
+function toExtensionManagementError(error, code) {
     if (error instanceof ExtensionManagementError) {
         return error;
     }
+    let extensionManagementError;
     if (error instanceof ExtensionGalleryError) {
-        const e = ( (new ExtensionManagementError(error.message, ExtensionManagementErrorCode.Gallery)));
-        e.stack = error.stack;
-        return e;
+        extensionManagementError = ( (new ExtensionManagementError(
+            error.message,
+            error.code === ExtensionGalleryErrorCode.DownloadFailedWriting ? ExtensionManagementErrorCode.DownloadFailedWriting : ExtensionManagementErrorCode.Gallery
+        )));
+    }
+    else {
+        extensionManagementError = ( (new ExtensionManagementError(
+            error.message,
+            isCancellationError(error) ? ExtensionManagementErrorCode.Cancelled : (code ?? ExtensionManagementErrorCode.Internal)
+        )));
     }
-    const e = ( (new ExtensionManagementError(
-        error.message,
-        isCancellationError(error) ? ExtensionManagementErrorCode.Cancelled : ExtensionManagementErrorCode.Internal
-    )));
-    e.stack = error.stack;
-    return e;
+    extensionManagementError.stack = error.stack;
+    return extensionManagementError;
 }
-function reportTelemetry(telemetryService, eventName, { extensionData, verificationStatus, duration, error, durationSinceUpdate }) {
+function reportTelemetry(telemetryService, eventName, { extensionData, verificationStatus, duration, error, source, durationSinceUpdate }) {
     let errorcode;
     let errorcodeDetail;
     if (isDefined(verificationStatus)) {
@@ -803,7 +812,7 @@ function reportTelemetry(telemetryService, eventName, { extensionData, verificat
             errorcodeDetail = error.message;
         }
     }
-    telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate });
+    telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate, source });
 }
 class AbstractExtensionTask {
     constructor() {

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

@@ -8,8 +8,9 @@ import { isBoolean } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
-import { getTargetPlatform, toTargetPlatform, WEB_EXTENSION_TAG, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { getTargetPlatform, SortBy, SortOrder, toTargetPlatform, WEB_EXTENSION_TAG, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, StatisticType, InstallOperation } 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 } 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';
@@ -21,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 ? "web"  : getTargetPlatform(platform, arch);
+const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
 var Flags;
 ( (function(Flags) {
@@ -77,8 +78,8 @@ const DefaultPageSize = 10;
 const DefaultQueryState = {
     pageNumber: 1,
     pageSize: DefaultPageSize,
-    sortBy: 0 ,
-    sortOrder: 0 ,
+    sortBy: SortBy.NoneOrRelevance,
+    sortOrder: SortOrder.Default,
     flags: Flags.None,
     criteria: [],
     assetTypes: []
@@ -204,15 +205,15 @@ function getIsPreview(flags) {
     return flags.indexOf('preview') !== -1;
 }
 function getTargetPlatformForExtensionVersion(version) {
-    return version.targetPlatform ? toTargetPlatform(version.targetPlatform) : "undefined" ;
+    return version.targetPlatform ? toTargetPlatform(version.targetPlatform) : TargetPlatform.UNDEFINED;
 }
 function getAllTargetPlatforms(rawGalleryExtension) {
     const allTargetPlatforms = distinct(( rawGalleryExtension.versions.map(getTargetPlatformForExtensionVersion)));
     const isWebExtension = !!rawGalleryExtension.tags?.includes(WEB_EXTENSION_TAG);
-    const webTargetPlatformIndex = allTargetPlatforms.indexOf("web" );
+    const webTargetPlatformIndex = allTargetPlatforms.indexOf(TargetPlatform.WEB);
     if (isWebExtension) {
         if (webTargetPlatformIndex === -1) {
-            allTargetPlatforms.push("web" );
+            allTargetPlatforms.push(TargetPlatform.WEB);
         }
     }
     else {
@@ -258,6 +259,7 @@ function toExtension(galleryExtension, version, allTargetPlatforms, queryContext
         coreTranslations: getCoreTranslationAssets(version)
     };
     return {
+        type: 'gallery',
         identifier: {
             id: getGalleryExtensionId(galleryExtension.publisher.publisherName, galleryExtension.extensionName),
             uuid: galleryExtension.extensionId
@@ -435,7 +437,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 text = text.length < 200 ? text : text.substring(0, 200);
                 query = query.withFilter(FilterType.SearchText, text);
             }
-            query = query.withSortBy(0 );
+            query = query.withSortBy(SortBy.NoneOrRelevance);
         }
         else if (options.ids) {
             query = query.withFilter(FilterType.ExtensionId, ...options.ids);
@@ -444,7 +446,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             query = query.withFilter(FilterType.ExtensionName, ...options.names);
         }
         else {
-            query = query.withSortBy(4 );
+            query = query.withSortBy(SortBy.InstallCount);
         }
         if (typeof options.sortBy === 'number') {
             query = query.withSortBy(options.sortBy);
@@ -575,7 +577,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             'Content-Length': String(data.length),
         };
         const stopWatch = ( new StopWatch());
-        let context, error, total = 0;
+        let context, errorCode, total = 0;
         try {
             context = await this.requestService.request({
                 type: 'POST',
@@ -603,9 +605,15 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             return { galleryExtensions: [], total };
         }
         catch (e) {
-            const errorCode = isCancellationError(e) ? ExtensionGalleryErrorCode.Cancelled : getErrorMessage(e).startsWith('XHR timeout') ? ExtensionGalleryErrorCode.Timeout : ExtensionGalleryErrorCode.Failed;
-            error = ( new ExtensionGalleryError(getErrorMessage(e), errorCode));
-            throw error;
+            if (isCancellationError(e)) {
+                errorCode = ExtensionGalleryErrorCode.Cancelled;
+                throw e;
+            }
+            else {
+                const errorMessage = getErrorMessage(e);
+                errorCode = errorMessage.startsWith('XHR timeout') ? ExtensionGalleryErrorCode.Timeout : ExtensionGalleryErrorCode.Failed;
+                throw ( new ExtensionGalleryError(errorMessage, errorCode));
+            }
         }
         finally {
             this.telemetryService.publicLog2('galleryService:query', {
@@ -615,7 +623,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 success: !!context && isSuccess(context),
                 responseBodySize: context?.res.headers['Content-Length'],
                 statusCode: context ? String(context.res.statusCode) : undefined,
-                errorCode: error?.code,
+                errorCode,
                 count: String(total)
             });
         }
@@ -624,7 +632,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         if (!this.isEnabled()) {
             return undefined;
         }
-        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 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 Accept = isWeb ? 'api-version=6.1-preview.1' : '*/*;api-version=4.0-preview.1';
         const commonHeaders = await this.commonHeadersPromise;
         const headers = { ...commonHeaders, Accept };
@@ -641,16 +649,26 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         this.logService.trace('ExtensionGalleryService#download', extension.identifier.id);
         const data = getGalleryExtensionTelemetryData(extension);
         const startTime = ( new Date()).getTime();
-        const log = (duration) => this.telemetryService.publicLog('galleryService:downloadVSIX', { ...data, duration });
-        const operationParam = operation === 2  ? 'install' : operation === 3  ? 'update' : '';
+        const operationParam = operation === InstallOperation.Install ? 'install' : operation === InstallOperation.Update ? '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`
         } : extension.assets.download;
         const headers = extension.queryContext?.[ACTIVITY_HEADER_NAME] ? { [ACTIVITY_HEADER_NAME]: extension.queryContext[ACTIVITY_HEADER_NAME] } : undefined;
         const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, headers ? { headers } : undefined);
-        await this.fileService.writeFile(location, context.stream);
-        log(( new Date()).getTime() - startTime);
+        try {
+            await this.fileService.writeFile(location, context.stream);
+        }
+        catch (error) {
+            try {
+                await this.fileService.del(location);
+            }
+            catch (e) {
+                this.logService.warn(`Error while deleting the file ${( location.toString())}`, getErrorMessage(e));
+            }
+            throw ( new ExtensionGalleryError(getErrorMessage(error), ExtensionGalleryErrorCode.DownloadFailedWriting));
+        }
+        this.telemetryService.publicLog('galleryService:downloadVSIX', { ...data, duration: ( new Date()).getTime() - startTime });
     }
     async downloadSignatureArchive(extension, location) {
         if (!extension.assets.signature) {
@@ -658,7 +676,18 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         this.logService.trace('ExtensionGalleryService#downloadSignatureArchive', extension.identifier.id);
         const context = await this.getAsset(extension.identifier.id, extension.assets.signature, AssetType.Signature);
-        await this.fileService.writeFile(location, context.stream);
+        try {
+            await this.fileService.writeFile(location, context.stream);
+        }
+        catch (error) {
+            try {
+                await this.fileService.del(location);
+            }
+            catch (e) {
+                this.logService.warn(`Error while deleting the file ${( location.toString())}`, getErrorMessage(e));
+            }
+            throw ( new ExtensionGalleryError(getErrorMessage(error), ExtensionGalleryErrorCode.DownloadFailedWriting));
+        }
     }
     async getReadme(extension, token) {
         if (extension.assets.readme) {

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

@@ -2,6 +2,8 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import 'vscode/vscode/vs/base/common/arrays';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
+import 'vscode/vscode/vs/base/common/charCode';
+import 'vscode/vscode/vs/base/common/marshallingIds';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/base/common/platform';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -11,7 +13,11 @@ import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/process';
 import 'vscode/vscode/vs/base/common/strings';
 import 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import 'vscode/vscode/vs/platform/extensions/common/extensions';
 import 'vscode/vscode/vs/base/common/network';
+import 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import '../../extensionRecommendations/common/extensionRecommendations.js';
+import 'vscode/vscode/vs/platform/storage/common/storage';
 
 let ExtensionTipsService = class ExtensionTipsService extends Disposable {
     constructor(fileService, productService) {

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

@@ -1,5 +1,7 @@
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { InstallOperation } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
+import { ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
 async function migrateUnsupportedExtensions(extensionManagementService, galleryService, extensionStorageService, extensionEnablementService, logService) {
     try {
@@ -7,7 +9,7 @@ async function migrateUnsupportedExtensions(extensionManagementService, galleryS
         if (!extensionsControlManifest.deprecated) {
             return;
         }
-        const installed = await extensionManagementService.getInstalled(1 );
+        const installed = await extensionManagementService.getInstalled(ExtensionType.User);
         for (const [unsupportedExtensionId, deprecated] of Object.entries(extensionsControlManifest.deprecated)) {
             if (!deprecated?.extension) {
                 continue;
@@ -32,7 +34,7 @@ async function migrateUnsupportedExtensions(extensionManagementService, galleryS
                 logService.info(`Uninstalled the unsupported extension '${unsupportedExtension.identifier.id}'`);
                 let preReleaseExtension = installed.find(i => areSameExtensions(i.identifier, { id: preReleaseExtensionId }));
                 if (!preReleaseExtension || (!preReleaseExtension.isPreReleaseVersion && isUnsupportedExtensionEnabled)) {
-                    preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: 4  });
+                    preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate });
                     logService.info(`Installed the pre-release extension '${preReleaseExtension.identifier.id}'`);
                     if (!isUnsupportedExtensionEnabled) {
                         await extensionEnablementService.disableExtension(preReleaseExtension.identifier);

package/vscode/src/vs/platform/extensionRecommendations/common/extensionRecommendations.js

@@ -1,9 +1,25 @@
+var RecommendationSource;
+( (function(RecommendationSource) {
+    RecommendationSource[RecommendationSource["FILE"] = 1] = "FILE";
+    RecommendationSource[RecommendationSource["WORKSPACE"] = 2] = "WORKSPACE";
+    RecommendationSource[RecommendationSource["EXE"] = 3] = "EXE";
+})(RecommendationSource || (RecommendationSource = {})));
 function RecommendationSourceToString(source) {
     switch (source) {
-        case 1 : return 'file';
-        case 2 : return 'workspace';
-        case 3 : return 'exe';
+        case RecommendationSource.FILE: return 'file';
+        case RecommendationSource.WORKSPACE: return 'workspace';
+        case RecommendationSource.EXE: return 'exe';
     }
 }
+var RecommendationsNotificationResult;
+( (function(RecommendationsNotificationResult) {
+    RecommendationsNotificationResult["Ignored"] = "ignored";
+    RecommendationsNotificationResult["Cancelled"] = "cancelled";
+    RecommendationsNotificationResult["TooMany"] = "toomany";
+    RecommendationsNotificationResult["IncompatibleWindow"] = "incompatibleWindow";
+    RecommendationsNotificationResult["Accepted"] = "reacted";
+})(
+    RecommendationsNotificationResult || (RecommendationsNotificationResult = {})
+));
 
-export { RecommendationSourceToString };
+export { RecommendationSource, RecommendationSourceToString, RecommendationsNotificationResult };

package/vscode/src/vs/platform/externalServices/common/marketplace.js

@@ -1,4 +1,5 @@
 import { getServiceMachineId } from 'vscode/vscode/vs/platform/externalServices/common/serviceMachineId';
+import { TelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { supportsTelemetry, getTelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 
 async function resolveMarketplaceHeaders(version, productService, environmentService, configurationService, fileService, storageService, telemetryService) {
@@ -6,7 +7,7 @@ async function resolveMarketplaceHeaders(version, productService, environmentSer
         'X-Market-Client-Id': `VSCode ${version}`,
         'User-Agent': `VSCode ${version} (${productService.nameShort})`
     };
-    if (supportsTelemetry(productService, environmentService) && getTelemetryLevel(configurationService) === 3 ) {
+    if (supportsTelemetry(productService, environmentService) && getTelemetryLevel(configurationService) === TelemetryLevel.USAGE) {
         const serviceMachineId = await getServiceMachineId(environmentService, fileService, storageService);
         headers['X-Market-User-Id'] = serviceMachineId;
         headers['VSCode-SessionId'] = telemetryService.machineId || serviceMachineId;

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileIpc.js

@@ -1,6 +1,8 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { reviveProfile } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import 'vscode/vscode/vs/base/common/marshallingIds';
+import 'vscode/vscode/vs/base/common/charCode';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/base/common/platform';
 

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 let IgnoredExtensionsManagementService = class IgnoredExtensionsManagementService {
@@ -20,7 +21,7 @@ let IgnoredExtensionsManagementService = class IgnoredExtensionsManagementServic
         if (ignore) {
             currentValue.push(ignoredExtensionId.toLowerCase());
         }
-        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, 2 );
+        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, ConfigurationTarget.USER);
     }
     updateSynchronizedExtensions(extensionId, sync) {
         let currentValue = ( [...this.configurationService.getValue('settingsSync.ignoredExtensions')].map(id => id.toLowerCase()));
@@ -28,7 +29,7 @@ let IgnoredExtensionsManagementService = class IgnoredExtensionsManagementServic
         if (sync) {
             currentValue.push(`-${extensionId.toLowerCase()}`);
         }
-        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, 2 );
+        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, ConfigurationTarget.USER);
     }
     getIgnoredExtensions(installed) {
         const defaultIgnoredExtensions = ( installed.filter(i => i.isMachineScoped).map(i => i.identifier.id.toLowerCase()));