@codingame/monaco-vscode-extension-gallery-service-override 4.5.2 → 5.0.0

package/package.json

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

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { distinct, isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { Barrier, createCancelablePromise } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import { getErrorMessage, CancellationError } from 'vscode/vscode/vs/base/common/errors';
+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 { isWeb } from 'vscode/vscode/vs/base/common/platform';
@@ -11,7 +11,7 @@ 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 { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
-import { areSameExtensions, getGalleryExtensionTelemetryData, ExtensionKey, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
+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 { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
@@ -98,15 +98,6 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (installableExtensions.length) {
             results.push(...(await this.installExtensions(installableExtensions)));
         }
-        for (const result of results) {
-            if (result.error) {
-                this.logService.error(`Failed to install extension.`, result.identifier.id);
-                this.logService.error(result.error);
-                if (result.source && !URI.isUri(result.source)) {
-                    reportTelemetry(this.telemetryService, 'extensionGallery:install', { extensionData: getGalleryExtensionTelemetryData(result.source), error: result.error });
-                }
-            }
-        }
         return results;
     }
     async uninstall(extension, options = {}) {
@@ -154,15 +145,14 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         this.participants.push(participant);
     }
     async installExtensions(extensions) {
-        const results = [];
+        const installExtensionResultsMap = ( (new Map()));
         const installingExtensionsMap = ( (new Map()));
         const alreadyRequestedInstallations = [];
-        const successResults = [];
         const getInstallExtensionTaskKey = (extension, profileLocation) => `${( (ExtensionKey.create(extension).toString()))}-${( (profileLocation.toString()))}`;
-        const createInstallExtensionTask = (manifest, extension, options) => {
+        const createInstallExtensionTask = (manifest, extension, options, root) => {
             const installExtensionTask = this.createInstallExtensionTask(manifest, extension, options);
-            const key = URI.isUri(extension) ? extension.path : `${extension.identifier.id.toLowerCase()}-${( (options.profileLocation.toString()))}`;
-            installingExtensionsMap.set(key, { task: installExtensionTask, manifest });
+            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);
             if (!URI.isUri(extension)) {
@@ -185,18 +175,18 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     alreadyRequestedInstallations.push(existingInstallExtensionTask.task.waitUntilTaskIsFinished());
                 }
                 else {
-                    createInstallExtensionTask(manifest, extension, installExtensionTaskOptions);
+                    createInstallExtensionTask(manifest, extension, installExtensionTaskOptions, undefined);
                 }
             }
-            await Promise.all(( ([...( (installingExtensionsMap.values()))].map(async ({ task, manifest }) => {
+            await Promise.all(( ([...( (installingExtensionsMap.values()))].map(async ({ task }) => {
                 if (task.options.donotIncludePackAndDependencies) {
                     this.logService.info('Installing the extension without checking dependencies and pack', task.identifier.id);
                 }
                 else {
                     try {
-                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, manifest, !!task.options.installOnlyNewlyAddedFromExtensionPack, !!task.options.installPreReleaseVersion, task.options.profileLocation, task.options.productVersion);
+                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, !!task.options.installOnlyNewlyAddedFromExtensionPack, !!task.options.installPreReleaseVersion, task.options.profileLocation, task.options.productVersion);
                         const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
-                        const options = { ...task.options, donotIncludePackAndDependencies: true, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
+                        const options = { ...task.options, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
                         for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
                             if (( (installingExtensionsMap.has(
                                 `${gallery.identifier.id.toLowerCase()}-${( (options.profileLocation.toString()))}`
@@ -219,16 +209,16 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                                 }
                             }
                             else if (!( (installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))))) {
-                                createInstallExtensionTask(manifest, gallery, options);
+                                createInstallExtensionTask(manifest, gallery, options, task);
                             }
                         }
                     }
                     catch (error) {
                         if (URI.isUri(task.source)) {
-                            if (isNonEmptyArray(manifest.extensionDependencies)) {
+                            if (isNonEmptyArray(task.manifest.extensionDependencies)) {
                                 this.logService.warn(`Cannot install dependencies of extension:`, task.identifier.id, error.message);
                             }
-                            if (isNonEmptyArray(manifest.extensionPack)) {
+                            if (isNonEmptyArray(task.manifest.extensionPack)) {
                                 this.logService.warn(`Cannot install packed extensions of extension:`, task.identifier.id, error.message);
                             }
                         }
@@ -239,7 +229,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     }
                 }
             }))));
-            await this.joinAllSettled(( ([...( (installingExtensionsMap.values()))].map(async ({ task }) => {
+            await this.joinAllSettled(( ([...installingExtensionsMap.entries()].map(async ([key, { task }]) => {
                 const startTime = ( (new Date())).getTime();
                 try {
                     const local = await task.run();
@@ -262,9 +252,14 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                             catch (error) {  }
                         }
                     }
-                    successResults.push({ local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
+                    installExtensionResultsMap.set(key, { local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
                 }
-                catch (error) {
+                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 });
+                    }
+                    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));
                     throw error;
                 }
@@ -272,29 +267,69 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (alreadyRequestedInstallations.length) {
                 await this.joinAllSettled(alreadyRequestedInstallations);
             }
-            for (const result of successResults) {
-                this.logService.info(`Extension installed successfully:`, result.identifier.id);
-                results.push(result);
-            }
-            return results;
+            return [...( (installExtensionResultsMap.values()))];
         }
         catch (error) {
-            if (successResults.length) {
-                this.logService.info('Rollback: Uninstalling installed extensions', getErrorMessage(error));
-                await Promise.allSettled(( (successResults.map(async ({ local, profileLocation }) => {
+            const getAllDepsAndPacks = (extension, profileLocation, allDepsOrPacks) => {
+                const depsOrPacks = [];
+                if (extension.manifest.extensionDependencies?.length) {
+                    depsOrPacks.push(...extension.manifest.extensionDependencies);
+                }
+                if (extension.manifest.extensionPack?.length) {
+                    depsOrPacks.push(...extension.manifest.extensionPack);
+                }
+                for (const id of depsOrPacks) {
+                    if (allDepsOrPacks.includes(id.toLowerCase())) {
+                        continue;
+                    }
+                    allDepsOrPacks.push(id.toLowerCase());
+                    const installed = installExtensionResultsMap.get(`${id.toLowerCase()}-${( (profileLocation.toString()))}`);
+                    if (installed?.local) {
+                        allDepsOrPacks = getAllDepsAndPacks(installed.local, profileLocation, allDepsOrPacks);
+                    }
+                }
+                return allDepsOrPacks;
+            };
+            const getErrorResult = (task) => ({ identifier: task.identifier, operation: 2 , source: task.source, context: task.options.context, profileLocation: task.profileLocation, error });
+            const rollbackTasks = [];
+            for (const [key, { task, root }] of installingExtensionsMap) {
+                const result = installExtensionResultsMap.get(key);
+                if (!result) {
+                    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 }));
+                    installExtensionResultsMap.set(key, getErrorResult(task));
+                }
+            }
+            for (const [key, { task }] of installingExtensionsMap) {
+                const result = installExtensionResultsMap.get(key);
+                if (!result?.local) {
+                    continue;
+                }
+                if (task.options.donotIncludePackAndDependencies) {
+                    continue;
+                }
+                const depsOrPacks = getAllDepsAndPacks(result.local, task.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 }));
+                    installExtensionResultsMap.set(key, getErrorResult(task));
+                }
+            }
+            if (rollbackTasks.length) {
+                await Promise.allSettled(( (rollbackTasks.map(async (rollbackTask) => {
                     try {
-                        await this.createUninstallExtensionTask(local, { versionOnly: true, profileLocation }).run();
-                        this.logService.info('Rollback: Uninstalled extension', local.identifier.id);
+                        await rollbackTask.run();
+                        this.logService.info('Rollback: Uninstalled extension', rollbackTask.extension.identifier.id);
                     }
                     catch (error) {
-                        this.logService.warn('Rollback: Error while uninstalling extension', local.identifier.id, getErrorMessage(error));
+                        this.logService.warn('Rollback: Error while uninstalling extension', rollbackTask.extension.identifier.id, getErrorMessage(error));
                     }
                 }))));
             }
-            for (const { task } of ( (installingExtensionsMap.values()))) {
-                task.cancel();
-                results.push({ identifier: task.identifier, operation: 2 , source: task.source, context: task.options.context, profileLocation: task.profileLocation, error });
-            }
             throw error;
         }
         finally {
@@ -303,7 +338,13 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     this.installingExtensions.delete(getInstallExtensionTaskKey(task.source, task.profileLocation));
                 }
             }
-            if (results.length) {
+            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._onDidInstallExtensions.fire(results);
             }
         }
@@ -337,7 +378,18 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
         }
         if (errors.length) {
-            throw joinErrors(errors);
+            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;
         }
         return results;
     }
@@ -568,7 +620,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     postUninstallExtension(task.extension);
                 }
                 catch (e) {
-                    const error = e instanceof ExtensionManagementError ? e : ( (new ExtensionManagementError(getErrorMessage(e), ExtensionManagementErrorCode.Internal)));
+                    const error = toExtensionManagementError(e);
                     postUninstallExtension(task.extension, error);
                     throw error;
                 }
@@ -578,7 +630,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }))));
         }
         catch (e) {
-            const error = e instanceof ExtensionManagementError ? e : ( (new ExtensionManagementError(getErrorMessage(e), ExtensionManagementErrorCode.Internal)));
+            const error = toExtensionManagementError(e);
             for (const task of allTasks) {
                 try {
                     task.cancel();
@@ -713,19 +765,6 @@ AbstractExtensionManagementService = ( (__decorate([
     ( (__param(4, IProductService))),
     ( (__param(5, IUserDataProfilesService)))
 ], AbstractExtensionManagementService)));
-function joinErrors(errorOrErrors) {
-    const errors = Array.isArray(errorOrErrors) ? errorOrErrors : [errorOrErrors];
-    if (errors.length === 1) {
-        return errors[0] instanceof Error ? errors[0] : ( (new Error(errors[0])));
-    }
-    return errors.reduce((previousValue, currentValue) => {
-        return (
-             (new Error(
-                `${previousValue.message}${previousValue.message ? ',' : ''}${currentValue instanceof Error ? currentValue.message : currentValue}`
-            ))
-        );
-    }, ( (new Error(''))));
-}
 function toExtensionManagementError(error) {
     if (error instanceof ExtensionManagementError) {
         return error;
@@ -735,7 +774,10 @@ function toExtensionManagementError(error) {
         e.stack = error.stack;
         return e;
     }
-    const e = ( (new ExtensionManagementError(error.message, ExtensionManagementErrorCode.Internal)));
+    const e = ( (new ExtensionManagementError(
+        error.message,
+        isCancellationError(error) ? ExtensionManagementErrorCode.Cancelled : ExtensionManagementErrorCode.Internal
+    )));
     e.stack = error.stack;
     return e;
 }
@@ -756,14 +798,9 @@ function reportTelemetry(telemetryService, eventName, { extensionData, verificat
         }
     }
     if (error) {
-        if (error instanceof ExtensionManagementError || error instanceof ExtensionGalleryError) {
-            errorcode = error.code;
-            if (error.code === ExtensionManagementErrorCode.Signature) {
-                errorcodeDetail = error.message;
-            }
-        }
-        else {
-            errorcode = ExtensionManagementErrorCode.Internal;
+        errorcode = error.code;
+        if (error.code === ExtensionManagementErrorCode.Signature) {
+            errorcodeDetail = error.message;
         }
     }
     telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate });
@@ -776,7 +813,7 @@ class AbstractExtensionTask {
         await this.barrier.wait();
         return this.cancellablePromise;
     }
-    async run() {
+    run() {
         if (!this.cancellablePromise) {
             this.cancellablePromise = createCancelablePromise(token => this.doRun(token));
         }
@@ -801,4 +838,4 @@ class AbstractExtensionTask {
     }
 }
 
-export { AbstractExtensionManagementService, AbstractExtensionTask, joinErrors, toExtensionManagementError };
+export { AbstractExtensionManagementService, AbstractExtensionTask, toExtensionManagementError };

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener, clearNode } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Action, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
@@ -20,6 +19,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -58,7 +58,7 @@ const _moduleId = "vs/workbench/contrib/extensions/browser/abstractRuntimeExtens
 let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor extends EditorPane {
     static { AbstractRuntimeExtensionsEditor_1 = this; }
     static { this.ID = 'workbench.editor.runtimeExtensions'; }
-    constructor(group, telemetryService, themeService, contextKeyService, _extensionsWorkbenchService, _extensionService, _notificationService, _contextMenuService, _instantiationService, storageService, _labelService, _environmentService, _clipboardService, _extensionFeaturesManagementService) {
+    constructor(group, telemetryService, themeService, contextKeyService, _extensionsWorkbenchService, _extensionService, _notificationService, _contextMenuService, _instantiationService, storageService, _labelService, _environmentService, _clipboardService, _extensionFeaturesManagementService, _hoverService) {
         super(AbstractRuntimeExtensionsEditor_1.ID, group, telemetryService, themeService, storageService);
         this._extensionsWorkbenchService = _extensionsWorkbenchService;
         this._extensionService = _extensionService;
@@ -69,6 +69,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
         this._environmentService = _environmentService;
         this._clipboardService = _clipboardService;
         this._extensionFeaturesManagementService = _extensionFeaturesManagementService;
+        this._hoverService = _hoverService;
         this._list = null;
         this._elements = null;
         this._updateSoon = this._register(( (new RunOnceScheduler(() => this._updateExtensions(), 200))));
@@ -287,12 +288,12 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 else {
                     title = ( localizeWithPath(_moduleId, 7, "Extension is activating..."));
                 }
-                data.elementDisposables.push(setupCustomHover(getDefaultHoverDelegate('mouse'), data.activationTime, title));
+                data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.activationTime, title));
                 clearNode(data.msgContainer);
                 if (this._getUnresponsiveProfile(element.description.identifier)) {
                     const el = $('span', undefined, ...renderLabelWithIcons(` $(alert) Unresponsive`));
                     const extensionHostFreezTitle = ( localizeWithPath(_moduleId, 8, "Extension has caused the extension host to freeze."));
-                    data.elementDisposables.push(setupCustomHover(getDefaultHoverDelegate('mouse'), el, extensionHostFreezTitle));
+                    data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), el, extensionHostFreezTitle));
                     data.msgContainer.appendChild(el);
                 }
                 if (isNonEmptyArray(element.status.runtimeErrors)) {
@@ -334,22 +335,23 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                             data.msgContainer.appendChild($('span', undefined, `${feature.label}: `));
                             data.msgContainer.appendChild($('span', undefined, ...renderLabelWithIcons(`$(${status.severity === Severity$1.Error ? errorIcon.id : warningIcon.id}) ${status.message}`)));
                         }
-                        if (accessData?.current) {
-                            const element = $('span', undefined, ( localizeWithPath(
+                        if (accessData?.totalCount > 0) {
+                            const element = $('span', undefined, `${( localizeWithPath(
                                 _moduleId,
                                 10,
-                                "{0} Requests: {1} (Session)",
+                                "{0} Requests: {1} (Overall)",
                                 feature.label,
-                                accessData.current.count
-                            )));
-                            const title = ( localizeWithPath(
-                                _moduleId,
-                                11,
-                                "Last request was {0}. Overall Requests: {1}",
-                                fromNow(accessData.current.lastAccessed, true, true),
                                 accessData.totalCount
-                            ));
-                            data.elementDisposables.push(setupCustomHover(getDefaultHoverDelegate('mouse'), element, title));
+                            ))}${accessData.current ? ( localizeWithPath(_moduleId, 11, ", {0} (Session)", accessData.current.count)) : ''}`);
+                            if (accessData.current) {
+                                const title = ( localizeWithPath(
+                                    _moduleId,
+                                    12,
+                                    "Last request was {0}.",
+                                    fromNow(accessData.current.lastAccessed, true, true)
+                                ));
+                                data.elementDisposables.push(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), element, title));
+                            }
                             data.msgContainer.appendChild(element);
                         }
                     }
@@ -374,7 +376,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
             },
             accessibilityProvider: new (class {
                 getWidgetAriaLabel() {
-                    return ( localizeWithPath(_moduleId, 12, "Runtime Extensions"));
+                    return ( localizeWithPath(_moduleId, 13, "Runtime Extensions"));
                 }
                 getAriaLabel(element) {
                     return element.description.name;
@@ -387,7 +389,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 return;
             }
             const actions = [];
-            actions.push(( (new Action('runtimeExtensionsEditor.action.copyId', ( localizeWithPath(_moduleId, 13, "Copy id ({0})", e.element.description.identifier.value)), undefined, true, () => {
+            actions.push(( (new Action('runtimeExtensionsEditor.action.copyId', ( localizeWithPath(_moduleId, 14, "Copy id ({0})", e.element.description.identifier.value)), undefined, true, () => {
                 this._clipboardService.writeText(e.element.description.identifier.value);
             }))));
             const reportExtensionIssueAction = this._createReportExtensionIssueAction(e.element);
@@ -396,8 +398,8 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
             }
             actions.push(( (new Separator())));
             if (e.element.marketplaceInfo) {
-                actions.push(( (new Action('runtimeExtensionsEditor.action.disableWorkspace', ( localizeWithPath(_moduleId, 14, "Disable (Workspace)")), undefined, true, () => this._extensionsWorkbenchService.setEnablement(e.element.marketplaceInfo, 7 )))));
-                actions.push(( (new Action('runtimeExtensionsEditor.action.disable', ( localizeWithPath(_moduleId, 15, "Disable")), undefined, true, () => this._extensionsWorkbenchService.setEnablement(e.element.marketplaceInfo, 6 )))));
+                actions.push(( (new Action('runtimeExtensionsEditor.action.disableWorkspace', ( localizeWithPath(_moduleId, 15, "Disable (Workspace)")), undefined, true, () => this._extensionsWorkbenchService.setEnablement(e.element.marketplaceInfo, 7 )))));
+                actions.push(( (new Action('runtimeExtensionsEditor.action.disable', ( localizeWithPath(_moduleId, 16, "Disable")), undefined, true, () => this._extensionsWorkbenchService.setEnablement(e.element.marketplaceInfo, 6 )))));
             }
             actions.push(( (new Separator())));
             const profileAction = this._createProfileAction();
@@ -437,13 +439,14 @@ AbstractRuntimeExtensionsEditor = AbstractRuntimeExtensionsEditor_1 = ( (__decor
     ( (__param(10, ILabelService))),
     ( (__param(11, IWorkbenchEnvironmentService))),
     ( (__param(12, IClipboardService))),
-    ( (__param(13, IExtensionFeaturesManagementService)))
+    ( (__param(13, IExtensionFeaturesManagementService))),
+    ( (__param(14, IHoverService)))
 ], AbstractRuntimeExtensionsEditor)));
 class ShowRuntimeExtensionsAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.showRuntimeExtensions',
-            title: ( localize2WithPath(_moduleId, 16, "Show Running Extensions")),
+            title: ( localize2WithPath(_moduleId, 17, "Show Running Extensions")),
             category: Categories.Developer,
             f1: true,
             menu: {

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener, setParentFlowTo } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { CheckboxActionViewItem } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
@@ -70,6 +69,7 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var ExtensionEditor_1;
 const _moduleId = "vs/workbench/contrib/extensions/browser/extensionEditor";
@@ -127,10 +127,10 @@ class ExtensionWithDifferentGalleryVersionWidget extends ExtensionWidget {
     }
 }
 class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
-    constructor(container) {
+    constructor(container, hoverService) {
         super();
         this.element = append(container, $('code.version'));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.element, ( localizeWithPath(_moduleId, 0, "Extension Version"))));
+        this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.element, ( localizeWithPath(_moduleId, 0, "Extension Version"))));
         this.render();
     }
     render() {
@@ -143,7 +143,7 @@ class VersionWidget extends ExtensionWithDifferentGalleryVersionWidget {
 let ExtensionEditor = class ExtensionEditor extends EditorPane {
     static { ExtensionEditor_1 = this; }
     static { this.ID = 'workbench.editor.extension'; }
-    constructor(group, telemetryService, instantiationService, paneCompositeService, extensionsWorkbenchService, extensionGalleryService, themeService, notificationService, openerService, extensionRecommendationsService, storageService, extensionService, webviewService, languageService, contextMenuService, contextKeyService, contextService, explorerService, viewsService, uriIdentityService) {
+    constructor(group, telemetryService, instantiationService, paneCompositeService, extensionsWorkbenchService, extensionGalleryService, themeService, notificationService, openerService, extensionRecommendationsService, storageService, extensionService, webviewService, languageService, contextMenuService, contextKeyService, contextService, explorerService, viewsService, uriIdentityService, hoverService) {
         super(ExtensionEditor_1.ID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.paneCompositeService = paneCompositeService;
@@ -161,6 +161,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         this.explorerService = explorerService;
         this.viewsService = viewsService;
         this.uriIdentityService = uriIdentityService;
+        this.hoverService = hoverService;
         this._scopedContextKeyService = this._register(( (new MutableDisposable())));
         this.initialScrollProgress = ( (new Map()));
         this.currentIdentifier = '';
@@ -190,26 +191,26 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
         const details = append(header, $('.details'));
         const title = append(details, $('.title'));
         const name = append(title, $('span.name.clickable', { role: 'heading', tabIndex: 0 }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), name, ( localizeWithPath(_moduleId, 1, "Extension name"))));
-        const versionWidget = ( (new VersionWidget(title)));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), name, ( localizeWithPath(_moduleId, 1, "Extension name"))));
+        const versionWidget = ( (new VersionWidget(title, this.hoverService)));
         const preview = append(title, $('span.preview'));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), preview, ( localizeWithPath(_moduleId, 2, "Preview"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), preview, ( localizeWithPath(_moduleId, 2, "Preview"))));
         preview.textContent = ( localizeWithPath(_moduleId, 2, "Preview"));
         const builtin = append(title, $('span.builtin'));
         builtin.textContent = ( localizeWithPath(_moduleId, 3, "Built-in"));
         const subtitle = append(details, $('.subtitle'));
         const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), publisher, ( localizeWithPath(_moduleId, 4, "Publisher"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), publisher, ( localizeWithPath(_moduleId, 4, "Publisher"))));
         publisher.setAttribute('role', 'button');
         const publisherDisplayName = append(publisher, $('.publisher-name'));
         const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
         const resource = append(append(subtitle, $('.subtitle-entry.resource')), $('', { tabIndex: 0 }));
         resource.setAttribute('role', 'button');
         const installCount = append(append(subtitle, $('.subtitle-entry')), $('span.install', { tabIndex: 0 }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), installCount, ( localizeWithPath(_moduleId, 5, "Install count"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), installCount, ( localizeWithPath(_moduleId, 5, "Install count"))));
         const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, false);
         const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { tabIndex: 0 }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), rating, ( localizeWithPath(_moduleId, 6, "Rating"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), rating, ( localizeWithPath(_moduleId, 6, "Rating"))));
         rating.setAttribute('role', 'link');
         const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, rating, false);
         const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, append(subtitle, $('.subtitle-entry')));
@@ -432,7 +433,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             const workspaceFolder = this.contextService.getWorkspaceFolder(location);
             if (workspaceFolder && extension.isWorkspaceScoped) {
                 template.resource.parentElement?.classList.add('clickable');
-                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
+                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
                 template.resource.textContent = ( localizeWithPath(_moduleId, 7, "Workspace Extension"));
                 this.transientDisposables.add(onClick(template.resource, () => {
                     this.viewsService.openView(VIEW_ID, true).then(() => this.explorerService.select(location, true));
@@ -440,7 +441,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             }
             else {
                 template.resource.parentElement?.classList.remove('clickable');
-                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
+                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
                 template.resource.textContent = ( localizeWithPath(_moduleId, 8, "Local Extension"));
             }
         }
@@ -806,7 +807,7 @@ let ExtensionEditor = class ExtensionEditor extends EditorPane {
             for (const [label, uri] of resources) {
                 const resource = append(resourcesElement, $('a.resource', { tabindex: '0' }, label));
                 this.transientDisposables.add(onClick(resource, () => this.openerService.open(uri)));
-                this.transientDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), resource, ( (uri.toString()))));
+                this.transientDisposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), resource, ( (uri.toString()))));
             }
         }
     }
@@ -940,7 +941,8 @@ ExtensionEditor = ExtensionEditor_1 = ( (__decorate([
     ( (__param(16, IWorkspaceContextService))),
     ( (__param(17, IExplorerService))),
     ( (__param(18, IViewsService))),
-    ( (__param(19, IUriIdentityService)))
+    ( (__param(19, IUriIdentityService))),
+    ( (__param(20, IHoverService)))
 ], ExtensionEditor)));
 const contextKeyExpr = ( (ContextKeyExpr.and(
      (ContextKeyExpr.equals('activeEditor', ExtensionEditor.ID)),