@codingame/monaco-vscode-extension-gallery-service-override 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0"
   }

package/vscode/src/vs/base/common/paging.js

@@ -1,6 +1,6 @@
 import { range } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { canceled } from 'vscode/vscode/vs/base/common/errors';
+import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 function createPage(elements) {
     return {
@@ -45,7 +45,7 @@ class PagedModel {
     }
     resolve(index, cancellationToken) {
         if (cancellationToken.isCancellationRequested) {
-            return Promise.reject(canceled());
+            return Promise.reject(( new CancellationError()));
         }
         const pageIndex = Math.floor(index / this.pager.pageSize);
         const indexInPage = index % this.pager.pageSize;
@@ -97,11 +97,11 @@ class DelayedPagedModel {
     resolve(index, cancellationToken) {
         return ( new Promise((c, e) => {
             if (cancellationToken.isCancellationRequested) {
-                return e(canceled());
+                return e(( new CancellationError()));
             }
             const timer = setTimeout(() => {
                 if (cancellationToken.isCancellationRequested) {
-                    return e(canceled());
+                    return e(( new CancellationError()));
                 }
                 timeoutCancellation.dispose();
                 this.model.resolve(index, cancellationToken).then(c, e);
@@ -109,7 +109,7 @@ class DelayedPagedModel {
             const timeoutCancellation = cancellationToken.onCancellationRequested(() => {
                 clearTimeout(timer);
                 timeoutCancellation.dispose();
-                e(canceled());
+                e(( new CancellationError()));
             });
         }));
     }

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

@@ -9,7 +9,7 @@ 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, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_DEP_PACK_CONTEXT, TargetPlatformToString, IExtensionGalleryService, ExtensionGalleryError } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId, getGalleryExtensionId, ExtensionKey, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
@@ -64,7 +64,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (result?.error) {
                 throw result.error;
             }
-            throw toExtensionManagementError(new Error(`Unknown error while installing extension ${extension.identifier.id}`));
+            throw new ExtensionManagementError(`Unknown error while installing extension ${extension.identifier.id}`, ExtensionManagementErrorCode.Unknown);
         }
         catch (error) {
             throw toExtensionManagementError(error);
@@ -72,7 +72,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'MarketPlaceDisabled', "Marketplace is not enabled"), ExtensionManagementErrorCode.Internal);
+            throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'MarketPlaceDisabled', "Marketplace is not enabled"), ExtensionManagementErrorCode.NotAllowed);
         }
         const results = [];
         const installableExtensions = [];
@@ -284,15 +284,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                         installResults.push({ local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
                     }
                     catch (error) {
-                        if (!URI.isUri(task.source)) {
-                            reportTelemetry(this.telemetryService, task.operation === 3  ? 'extensionGallery:update' : 'extensionGallery:install', {
-                                extensionData: getGalleryExtensionTelemetryData(task.source),
-                                verificationStatus: task.verificationStatus,
-                                duration: ( new Date()).getTime() - startTime,
-                                error
-                            });
-                        }
-                        this.logService.error('Error while installing the extension:', task.identifier.id);
+                        this.logService.error('Error while installing the extension', task.identifier.id, getErrorMessage(error));
                         throw error;
                     }
                     finally {
@@ -447,7 +439,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease);
             if (!compatibleExtension) {
                 if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
-                    throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundReleaseExtension', "Can't install release version of '{0}' extension because it has no release version.", extension.identifier.id), ExtensionManagementErrorCode.ReleaseVersionNotFound);
+                    throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundReleaseExtension', "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('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundCompatibleDependency', "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);
             }
@@ -724,6 +716,11 @@ function toExtensionManagementError(error) {
     if (error instanceof ExtensionManagementError) {
         return error;
     }
+    if (error instanceof ExtensionGalleryError) {
+        const e = ( new ExtensionManagementError(error.message, ExtensionManagementErrorCode.Gallery));
+        e.stack = error.stack;
+        return e;
+    }
     const e = ( new ExtensionManagementError(error.message, ExtensionManagementErrorCode.Internal));
     e.stack = error.stack;
     return e;
@@ -745,7 +742,7 @@ function reportTelemetry(telemetryService, eventName, { extensionData, verificat
         }
     }
     if (error) {
-        if (error instanceof ExtensionManagementError) {
+        if (error instanceof ExtensionManagementError || error instanceof ExtensionGalleryError) {
             errorcode = error.code;
             if (error.code === ExtensionManagementErrorCode.Signature) {
                 errorcodeDetail = error.message;

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

@@ -8,7 +8,7 @@ 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';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
-import { getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform, WEB_EXTENSION_TAG } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, toTargetPlatform, WEB_EXTENSION_TAG } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isEngineValid } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
@@ -69,7 +69,8 @@ const PropertyType = {
     PreRelease: 'Microsoft.VisualStudio.Code.PreRelease',
     LocalizedLanguages: 'Microsoft.VisualStudio.Code.LocalizedLanguages',
     WebExtension: 'Microsoft.VisualStudio.Code.WebExtension',
-    SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink'
+    SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
+    SupportLink: 'Microsoft.VisualStudio.Services.Links.Support',
 };
 const DefaultPageSize = 10;
 const DefaultQueryState = {
@@ -195,6 +196,9 @@ function getLocalizedLanguages(version) {
 function getSponsorLink(version) {
     return version.properties?.find(p => p.key === PropertyType.SponsorLink)?.value;
 }
+function getSupportLink(version) {
+    return version.properties?.find(p => p.key === PropertyType.SupportLink)?.value;
+}
 function getIsPreview(flags) {
     return flags.indexOf('preview') !== -1;
 }
@@ -287,7 +291,8 @@ function toExtension(galleryExtension, version, allTargetPlatforms, queryContext
         hasReleaseVersion: true,
         preview: getIsPreview(galleryExtension.flags),
         isSigned: !!assets.signature,
-        queryContext
+        queryContext,
+        supportLink: getSupportLink(latestVersion)
     };
 }
 let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
@@ -597,8 +602,9 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             return { galleryExtensions: [], total };
         }
         catch (e) {
-            error = e;
-            throw e;
+            const errorCode = isCancellationError(e) ? ExtensionGalleryErrorCode.Cancelled : getErrorMessage(e).startsWith('XHR timeout') ? ExtensionGalleryErrorCode.Timeout : ExtensionGalleryErrorCode.Failed;
+            error = ( new ExtensionGalleryError(getErrorMessage(e), errorCode));
+            throw error;
         }
         finally {
             this.telemetryService.publicLog2('galleryService:query', {
@@ -608,9 +614,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 success: !!context && isSuccess(context),
                 responseBodySize: context?.res.headers['Content-Length'],
                 statusCode: context ? String(context.res.statusCode) : undefined,
-                errorCode: error
-                    ? isCancellationError(error) ? 'canceled' : getErrorMessage(error).startsWith('XHR timeout') ? 'timeout' : 'failed'
-                    : undefined,
+                errorCode: error?.code,
                 count: String(total)
             });
         }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.js

@@ -44,8 +44,8 @@ import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from 'vscode/vsco
 import { editorBackground, textLinkForeground, textLinkActiveForeground, buttonHoverBackground, buttonForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { InstallDropdownAction, ReloadAction, ExtensionStatusLabelAction, ActionWithDropDownAction, UpdateAction, ToggleAutoUpdateForExtensionAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, SetLanguageAction, ClearLanguageAction, EnableDropDownAction, DisableDropDownAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, InstallingLabelAction, UninstallAction, MigrateDeprecatedExtensionAction, InstallAnotherVersionAction, SwitchToPreReleaseVersionAction, SwitchToReleasedVersionAction, ExtensionEditorManageExtensionAction, ExtensionDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionStatusAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
-import { errorIcon, warningIcon, infoIcon, preReleaseIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { InstallDropdownAction, ReloadAction, ExtensionStatusLabelAction, ActionWithDropDownAction, UpdateAction, ToggleAutoUpdateForExtensionAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, SetLanguageAction, ClearLanguageAction, EnableDropDownAction, DisableDropDownAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, InstallingLabelAction, UninstallAction, MigrateDeprecatedExtensionAction, InstallAnotherVersionAction, TogglePreReleaseExtensionAction, ExtensionEditorManageExtensionAction, ExtensionDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionStatusAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { errorIcon, warningIcon, infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { Delegate } from './extensionsList.js';
 import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from './extensionsViewer.js';
 import { RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
@@ -126,33 +126,7 @@ class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
         if (!this.extension || !valid(this.extension.version)) {
             return;
         }
-        this.element.textContent = `v${this.gallery?.version ?? this.extension.version}`;
-    }
-}
-class PreReleaseTextWidget extends ExtensionWithDifferentGalleryVersionWidget {
-    constructor(container) {
-        super();
-        this.element = append(container, $('span.pre-release'));
-        append(this.element, $('span' + ThemeIcon.asCSSSelector(preReleaseIcon)));
-        const textElement = append(this.element, $('span.pre-release-text'));
-        textElement.textContent = ( localizeWithPath(
-            'vs/workbench/contrib/extensions/browser/extensionEditor',
-            'preRelease',
-            "Pre-Release"
-        ));
-        this.render();
-    }
-    render() {
-        this.element.style.display = this.isPreReleaseVersion() ? 'inherit' : 'none';
-    }
-    isPreReleaseVersion() {
-        if (!this.extension) {
-            return false;
-        }
-        if (this.gallery) {
-            return this.gallery.properties.isPreReleaseVersion;
-        }
-        return !!(this.extension.state === 1  ? this.extension.local?.isPreReleaseVersion : this.extension.gallery?.properties.isPreReleaseVersion);
+        this.element.textContent = `v${this.gallery?.version ?? this.extension.version}${this.extension.isPreReleaseVersion ? ' (pre-release)' : ''}`;
     }
 }
 let ExtensionEditor = class ExtensionEditor extends EditorPane {
@@ -207,7 +181,6 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             "Extension name"
         )), role: 'heading', tabIndex: 0 }));
         const versionWidget = ( new VersionWidget(title));
-        const preReleaseWidget = ( new PreReleaseTextWidget(title));
         const preview = append(title, $('span.preview', { title: ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionEditor',
             'preview',
@@ -250,7 +223,6 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const widgets = [
             remoteBadge,
             versionWidget,
-            preReleaseWidget,
             verifiedPublisherWidget,
             installCountWidget,
             ratingsWidget,
@@ -281,8 +253,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
                     this.instantiationService.createInstance(InstallAnotherVersionAction),
                 ]
             ]),
-            this.instantiationService.createInstance(SwitchToPreReleaseVersionAction, false),
-            this.instantiationService.createInstance(SwitchToReleasedVersionAction, false),
+            this.instantiationService.createInstance(TogglePreReleaseExtensionAction),
             this.instantiationService.createInstance(ToggleAutoUpdateForExtensionAction, false, [false, 'onlySelectedExtensions']),
             ( new ExtensionEditorManageExtensionAction(
                 this.scopedContextKeyService || this.contextKeyService,
@@ -367,7 +338,6 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             },
             set gallery(gallery) {
                 versionWidget.gallery = gallery;
-                preReleaseWidget.gallery = gallery;
             },
             set manifest(manifest) {
                 installAction.manifest = manifest;
@@ -486,17 +456,15 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             this.initialScrollProgress.clear();
             this.currentIdentifier = extension.identifier.id;
         }
-        if (extension.hasReadme()) {
-            template.navbar.push("readme" , ( localizeWithPath(
-                'vs/workbench/contrib/extensions/browser/extensionEditor',
-                'details',
-                "Details"
-            )), ( localizeWithPath(
-                'vs/workbench/contrib/extensions/browser/extensionEditor',
-                'detailstooltip',
-                "Extension details, rendered from the extension's 'README.md' file"
-            )));
-        }
+        template.navbar.push("readme" , ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionEditor',
+            'details',
+            "Details"
+        )), ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionEditor',
+            'detailstooltip',
+            "Extension details, rendered from the extension's 'README.md' file"
+        )));
         if (manifest && manifest.contributes) {
             template.navbar.push("contributions" , ( localizeWithPath(
                 'vs/workbench/contrib/extensions/browser/extensionEditor',
@@ -865,6 +833,16 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
                 "Marketplace"
             )), ( URI.parse(extension.url))]);
         }
+        if (extension.url && extension.supportUrl) {
+            try {
+                resources.push([( localizeWithPath(
+                    'vs/workbench/contrib/extensions/browser/extensionEditor',
+                    'issues',
+                    "Issues"
+                )), ( URI.parse(extension.supportUrl))]);
+            }
+            catch (error) {  }
+        }
         if (extension.repository) {
             try {
                 resources.push([( localizeWithPath(

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js

@@ -22,11 +22,6 @@ import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbe
 
 const ignoreImportantExtensionRecommendationStorageKey = 'extensionsAssistant/importantRecommendationsIgnore';
 const donotShowWorkspaceRecommendationsStorageKey = 'extensionsAssistant/workspaceRecommendationsIgnore';
-const choiceNever = ( localizeWithPath(
-    'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService',
-    'neverShowAgain',
-    "Don't Show Again"
-));
 class RecommendationsNotification extends Disposable {
     constructor(severity, message, choices, notificationService) {
         super();
@@ -235,12 +230,26 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
         if (!searchValue) {
             searchValue = source === 2  ? '@recommended' : ( extensions.map(extensionId => `@id:${extensionId.identifier.id}`)).join(' ');
         }
+        const donotShowAgainLabel = source === 2  ? ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService',
+            'donotShowAgain',
+            "Don't Show Again for this Repository"
+        ))
+            : extensions.length > 1 ? ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService',
+            'donotShowAgainExtension',
+            "Don't Show Again for these Extensions"
+        )) : ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService',
+            'donotShowAgainExtensionSingle',
+            "Don't Show Again for this Extension"
+        ));
         return raceCancellablePromises([
-            this._registerP(this.showRecommendationsNotification(extensions, message, searchValue, source, recommendationsNotificationActions)),
+            this._registerP(this.showRecommendationsNotification(extensions, message, searchValue, donotShowAgainLabel, source, recommendationsNotificationActions)),
             this._registerP(this.waitUntilRecommendationsAreInstalled(extensions))
         ]);
     }
-    showRecommendationsNotification(extensions, message, searchValue, source, { onDidInstallRecommendedExtensions, onDidShowRecommendedExtensions, onDidCancelRecommendedExtensions, onDidNeverShowRecommendedExtensionsAgain }) {
+    showRecommendationsNotification(extensions, message, searchValue, donotShowAgainLabel, source, { onDidInstallRecommendedExtensions, onDidShowRecommendedExtensions, onDidCancelRecommendedExtensions, onDidNeverShowRecommendedExtensionsAgain }) {
         return createCancelablePromise(async (token) => {
             let accepted = false;
             const choices = [];
@@ -284,7 +293,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
                         this.runAction(this.instantiationService.createInstance(SearchExtensionsAction, searchValue));
                     }
                 }, {
-                    label: choiceNever,
+                    label: donotShowAgainLabel,
                     isSecondary: true,
                     run: () => {
                         onDidNeverShowRecommendedExtensionsAgain(extensions);