@codingame/monaco-vscode-update-service-override 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/update/browser/update.js

@@ -32,8 +32,9 @@ import { Promises, Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { IUserDataSyncWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataSync/common/userDataSync.service';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
-import { getInternalOrg } from '../../../../platform/assignment/common/assignment.js';
+import { getInternalOrg } from '@codingame/monaco-vscode-api/vscode/vs/platform/assignment/common/assignment';
 import { tryParseVersion } from '../common/updateUtils.js';
+import { UpdateGlobalActivityBadgeVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/update/common/update';
 
 var ProductContribution_1, DefaultAccountUpdateContribution_1;
 const CONTEXT_UPDATE_STATE = ( new RawContextKey("updateState", StateType.Uninitialized));
@@ -53,7 +54,7 @@ async function openLatestReleaseNotesInBrowser(accessor) {
         await openerService.open(uri);
     } else {
         throw ( new Error(( localize(
-            16311,
+            18375,
             "This version of {0} does not have release notes online",
             productService.nameLong
         ))));
@@ -76,7 +77,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.check",
-            title: ( localize(16312, "Check for Updates..."))
+            title: ( localize(18376, "Check for Updates..."))
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Idle))
     });
@@ -84,7 +85,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.checking",
-            title: ( localize(16313, "Checking for Updates...")),
+            title: ( localize(18377, "Checking for Updates...")),
             precondition: ( ContextKeyExpr.false())
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.CheckingForUpdates))
@@ -93,7 +94,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.downloadNow",
-            title: ( localize(16314, "Download Update (1)"))
+            title: ( localize(18378, "Download Update (1)"))
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.AvailableForDownload))
     });
@@ -101,7 +102,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.downloading",
-            title: ( localize(16315, "Downloading Update...")),
+            title: ( localize(18379, "Downloading Update...")),
             precondition: ( ContextKeyExpr.false())
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Downloading))
@@ -110,7 +111,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.install",
-            title: ( localize(16316, "Install Update... (1)"))
+            title: ( localize(18380, "Install Update... (1)"))
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Downloaded))
     });
@@ -118,7 +119,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.updating",
-            title: ( localize(16317, "Installing Update...")),
+            title: ( localize(18381, "Installing Update...")),
             precondition: ( ContextKeyExpr.false())
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Updating))
@@ -127,7 +128,7 @@ function appendUpdateMenuItems(menuId, group) {
         group,
         command: {
             id: "update.cancelling",
-            title: ( localize(16318, "Cancelling Update...")),
+            title: ( localize(18382, "Cancelling Update...")),
             precondition: ( ContextKeyExpr.false())
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Cancelling))
@@ -137,7 +138,7 @@ function appendUpdateMenuItems(menuId, group) {
         order: 2,
         command: {
             id: "update.restart",
-            title: ( localize(16319, "Restart to Update (1)"))
+            title: ( localize(18383, "Restart to Update (1)"))
         },
         when: ( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Ready))
     });
@@ -179,12 +180,12 @@ let ProductContribution = class ProductContribution {
             if (shouldShowReleaseNotes && !shouldShowPostInstallInfo && !environmentService.skipReleaseNotes && releaseNotesUrl && lastVersion && currentVersion && isMajorMinorUpdate(lastVersion, currentVersion)) {
                 showReleaseNotesInEditor(instantiationService, productService.version, false).then(undefined, () => {
                     notificationService.prompt(Severity.Info, ( localize(
-                        16320,
+                        18384,
                         "Welcome to {0} v{1}! Would you like to read the Release Notes?",
                         productService.nameLong,
                         productService.version
                     )), [{
-                        label: ( localize(16321, "Release Notes")),
+                        label: ( localize(18385, "Release Notes")),
                         run: () => {
                             const uri = ( URI.parse(releaseNotesUrl));
                             openerService.open(uri);
@@ -220,6 +221,7 @@ let UpdateContribution = class UpdateContribution extends Disposable {
         this.dialogService = dialogService;
         this.updateService = updateService;
         this.activityService = activityService;
+        this.contextKeyService = contextKeyService;
         this.productService = productService;
         this.hostService = hostService;
         this.badgeDisposable = this._register(( new MutableDisposable()));
@@ -227,6 +229,12 @@ let UpdateContribution = class UpdateContribution extends Disposable {
         this.updateStateContextKey = CONTEXT_UPDATE_STATE.bindTo(contextKeyService);
         this.majorMinorUpdateAvailableContextKey = MAJOR_MINOR_UPDATE_AVAILABLE.bindTo(contextKeyService);
         this._register(updateService.onStateChange(this.onUpdateStateChange, this));
+        const updateGlobalActivityBadgeContextKeys = ( new Set(( UpdateGlobalActivityBadgeVisibleContext.keys())));
+        this._register(contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(updateGlobalActivityBadgeContextKeys)) {
+                this.updateBadge(this.updateService.state);
+            }
+        }));
         this.onUpdateStateChange(this.updateService.state);
         const currentVersion = this.productService.commit;
         const lastKnownVersion = storageService.get("update/lastKnownVersion", StorageScope.APPLICATION);
@@ -241,7 +249,7 @@ let UpdateContribution = class UpdateContribution extends Disposable {
         switch (state.type) {
         case StateType.Idle:
             if (state.notAvailable && !state.error && (await this.hostService.hadLastFocus())) {
-                this.dialogService.info(( localize(16322, "There are currently no updates available.")));
+                this.dialogService.info(( localize(18386, "There are currently no updates available.")));
             }
             break;
         case StateType.Ready:
@@ -257,25 +265,28 @@ let UpdateContribution = class UpdateContribution extends Disposable {
                 break;
             }
         }
-        let badge = undefined;
+        this.updateBadge(state);
+        this.state = state;
+    }
+    updateBadge(state) {
+        let badge;
         if (state.type === StateType.AvailableForDownload || state.type === StateType.Downloaded || state.type === StateType.Ready) {
-            badge = ( new NumberBadge(1, () => ( localize(16323, "New {0} update available.", this.productService.nameShort))));
+            badge = ( new NumberBadge(1, () => ( localize(18387, "New {0} update available.", this.productService.nameShort))));
         } else if (state.type === StateType.CheckingForUpdates) {
-            badge = ( new ProgressBadge(() => ( localize(16324, "Checking for {0} updates...", this.productService.nameShort))));
+            badge = ( new ProgressBadge(() => ( localize(18388, "Checking for {0} updates...", this.productService.nameShort))));
         } else if (state.type === StateType.Downloading || state.type === StateType.Overwriting) {
-            badge = ( new ProgressBadge(() => ( localize(16325, "Downloading {0} update...", this.productService.nameShort))));
+            badge = ( new ProgressBadge(() => ( localize(18389, "Downloading {0} update...", this.productService.nameShort))));
         } else if (state.type === StateType.Updating) {
-            badge = ( new ProgressBadge(() => ( localize(16326, "Updating {0}...", this.productService.nameShort))));
+            badge = ( new ProgressBadge(() => ( localize(18390, "Updating {0}...", this.productService.nameShort))));
         } else if (state.type === StateType.Cancelling) {
-            badge = ( new ProgressBadge(() => ( localize(16327, "Cancelling {0} update...", this.productService.nameShort))));
+            badge = ( new ProgressBadge(() => ( localize(18391, "Cancelling {0} update...", this.productService.nameShort))));
         }
         this.badgeDisposable.clear();
-        if (badge) {
+        if (badge && this.contextKeyService.contextMatchesRules(UpdateGlobalActivityBadgeVisibleContext)) {
             this.badgeDisposable.value = this.activityService.showGlobalActivity({
                 badge
             });
         }
-        this.state = state;
     }
     registerGlobalActivityActions() {
         CommandsRegistry.registerCommand("update.check", () => this.updateService.checkForUpdates(true));
@@ -305,7 +316,7 @@ let UpdateContribution = class UpdateContribution extends Disposable {
                 order: 1,
                 command: {
                     id: "update.showUpdateReleaseNotes",
-                    title: ( localize(16328, "Show Update Release Notes"))
+                    title: ( localize(18392, "Show Update Release Notes"))
                 },
                 when: ( ContextKeyExpr.and(( CONTEXT_UPDATE_STATE.isEqualTo(StateType.Ready)), MAJOR_MINOR_UPDATE_AVAILABLE))
             });
@@ -331,7 +342,7 @@ let SwitchProductQualityContribution = class SwitchProductQualityContribution ex
                 constructor() {
                     super({
                         id: commandId,
-                        title: isSwitchingToInsiders ? ( localize(16329, "Switch to Insiders Version...")) : ( localize(16330, "Switch to Stable Version...")),
+                        title: isSwitchingToInsiders ? ( localize(18393, "Switch to Insiders Version...")) : ( localize(18394, "Switch to Stable Version...")),
                         precondition: IsWebContext,
                         menu: {
                             id: MenuId.GlobalActivity,
@@ -369,15 +380,15 @@ let SwitchProductQualityContribution = class SwitchProductQualityContribution ex
                         }
                         const res = await dialogService.confirm({
                             type: "info",
-                            message: ( localize(16331, "Changing the version requires a reload to take effect")),
+                            message: ( localize(18395, "Changing the version requires a reload to take effect")),
                             detail: newQuality === "insider" ? ( localize(
-                                16332,
+                                18396,
                                 "Press the reload button to switch to the Insiders version of VS Code."
                             )) : ( localize(
-                                16333,
+                                18397,
                                 "Press the reload button to switch to the Stable version of VS Code."
                             )),
-                            primaryButton: ( localize(16334, "&&Reload"))
+                            primaryButton: ( localize(18398, "&&Reload"))
                         });
                         if (res.confirmed) {
                             const promises = [];
@@ -407,18 +418,18 @@ let SwitchProductQualityContribution = class SwitchProductQualityContribution ex
                     } = await dialogService.prompt({
                         type: Severity.Info,
                         message: ( localize(
-                            16335,
+                            18399,
                             "Choose the settings sync service to use after changing the version"
                         )),
                         detail: ( localize(
-                            16336,
+                            18400,
                             "The Insiders version of VS Code will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."
                         )),
                         buttons: [{
-                            label: ( localize(16337, "&&Insiders")),
+                            label: ( localize(18401, "&&Insiders")),
                             run: () => "insiders"
                         }, {
-                            label: ( localize(16338, "&&Stable (current)")),
+                            label: ( localize(18402, "&&Stable (current)")),
                             run: () => "stable"
                         }],
                         cancelButton: true

package/vscode/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.d.ts

@@ -1,11 +1,13 @@
 import { BaseActionViewItem, IBaseActionViewItemOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems";
-import { IManagedHoverContent } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
+import { IManagedHoverContent, IManagedHoverOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
+import { AnchorAlignment } from "@codingame/monaco-vscode-api/vscode/vs/base/common/layout";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
 import { IMenuItem, MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ContextKeyExpression } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -17,6 +19,7 @@ import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { UpdateTooltip } from "./updateTooltip.js";
 export declare function registerUpdateTitleBarMenuPlacement(menuId: MenuId, item?: Omit<IMenuItem, "command">): void;
+export declare function getAdditionalUpdateTitleBarMenuWhen(when?: ContextKeyExpression): ContextKeyExpression;
 /**
  * Displays update status and actions in the title bar.
  */
@@ -29,6 +32,7 @@ export declare class UpdateTitleBarContribution extends Disposable implements IW
     private state;
     private entry;
     private tooltipVisible;
+    private tooltipFocused;
     constructor(actionViewItemService: IActionViewItemService, chatService: IChatService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, hostService: IHostService, instantiationService: IInstantiationService, storageService: IStorageService, updateService: IUpdateService);
     private createEntry;
     private onStateChange;
@@ -37,18 +41,23 @@ export declare class UpdateTitleBarContribution extends Disposable implements IW
  * Custom action view item for the update indicator in the title bar.
  */
 export declare class UpdateTitleBarEntry extends BaseActionViewItem {
+    private readonly anchorAlignment;
     private readonly tooltip;
+    private readonly onDidShowTooltip;
     private readonly onUserDismissedTooltip;
     private readonly commandService;
     private readonly hoverService;
     private readonly telemetryService;
     private readonly updateService;
     private content;
-    private showTooltipOnRender;
-    constructor(action: IAction, options: IBaseActionViewItemOptions, tooltip: UpdateTooltip, onUserDismissedTooltip: () => void, commandService: ICommandService, hoverService: IHoverService, telemetryService: ITelemetryService, updateService: IUpdateService);
+    private tooltipFocusOnRender;
+    private readonly visibleTooltip;
+    constructor(action: IAction, options: IBaseActionViewItemOptions, anchorAlignment: AnchorAlignment, tooltip: UpdateTooltip, onDidShowTooltip: (focus: boolean) => void, onUserDismissedTooltip: () => void, commandService: ICommandService, hoverService: IHoverService, telemetryService: ITelemetryService, updateService: IUpdateService);
     render(container: HTMLElement): void;
     showTooltip(focus?: boolean): void;
+    private focusTooltip;
     protected getHoverContents(): IManagedHoverContent;
+    protected getHoverOptions(): IManagedHoverOptions;
     private runAction;
     private onStateChange;
     private renderProgressState;

package/vscode/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.js

@@ -3,7 +3,8 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { append, $, scheduleAtNextAnimationFrame, getWindow, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { AnchorAlignment } from '@codingame/monaco-vscode-api/vscode/vs/base/common/layout';
+import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -11,7 +12,7 @@ import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/p
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -20,9 +21,9 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { StateType, DisablementReason } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
 import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
-import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { UpdateTitleBarEditorVisibleContext, UpdateTitleBarContext, UpdateTitleBarChatInProgressContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/update/common/update';
 import { computeProgressPercent } from '../common/updateUtils.js';
 import * as updateTitleBarEntry from './media/updateTitleBarEntry.css';
 import { UpdateTooltip } from './updateTooltip.js';
@@ -30,8 +31,6 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 registerCss(updateTitleBarEntry);
 const UPDATE_TITLE_BAR_ACTION_ID = "workbench.actions.updateIndicator";
-const UPDATE_TITLE_BAR_CONTEXT = ( new RawContextKey("updateTitleBar", false));
-const UPDATE_TITLE_BAR_CHAT_IN_PROGRESS_CONTEXT = ( new RawContextKey("updateTitleBarChatRequestInProgress", false));
 const DISABLED_REMINDER_LAST_SHOWN_KEY = "update/disabledReminderLastShown";
 const DISABLED_REMINDER_PERIOD = 30 * 24 * 60 * 60 * 1000;
 const UPDATE_TITLE_BAR_SETTING = "update.titleBar";
@@ -48,12 +47,12 @@ registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
     constructor() {
         super({
             id: UPDATE_TITLE_BAR_ACTION_ID,
-            title: ( localize(16339, "Update")),
+            title: ( localize(18403, "Update")),
             f1: false,
             menu: [{
-                id: MenuId.TitleBarAdjacentCenter,
+                id: MenuId.TitleBarUpdate,
                 order: 0,
-                when: ( ContextKeyExpr.and(UPDATE_TITLE_BAR_CONTEXT, ( InEditorZenModeContext.negate()), ContextKeyExpr.not("inDebugMode"), ( UPDATE_TITLE_BAR_CHAT_IN_PROGRESS_CONTEXT.negate())))
+                when: UpdateTitleBarEditorVisibleContext
             }]
         });
     }
@@ -75,12 +74,13 @@ let UpdateTitleBarContribution = class UpdateTitleBarContribution extends Dispos
         this.hostService = hostService;
         this.storageService = storageService;
         this.tooltipVisible = false;
+        this.tooltipFocused = false;
         if (isWeb) {
             return;
         }
-        this.context = UPDATE_TITLE_BAR_CONTEXT.bindTo(contextKeyService);
+        this.context = UpdateTitleBarContext.bindTo(contextKeyService);
         this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip));
-        const chatInProgressContext = UPDATE_TITLE_BAR_CHAT_IN_PROGRESS_CONTEXT.bindTo(contextKeyService);
+        const chatInProgressContext = UpdateTitleBarChatInProgressContext.bindTo(contextKeyService);
         this._register(autorun(reader => {
             chatInProgressContext.set(chatService.requestInProgressObs.read(reader));
         }));
@@ -95,31 +95,45 @@ let UpdateTitleBarContribution = class UpdateTitleBarContribution extends Dispos
             }
         }));
         this._register(actionViewItemService.register(
-            MenuId.TitleBarAdjacentCenter,
+            MenuId.TitleBarUpdate,
             UPDATE_TITLE_BAR_ACTION_ID,
-            (action, options) => this.createEntry(instantiationService, action, options)
+            (action, options) => this.createEntry(instantiationService, action, options, AnchorAlignment.RIGHT)
         ));
         void this.onStateChange(true);
     }
-    createEntry(instantiationService, action, options) {
-        this.entry = instantiationService.createInstance(UpdateTitleBarEntry, action, options, this.tooltip, () => {
-            this.tooltipVisible = false;
-            if (!ACTIONABLE_STATES.includes(this.state.type) && !DETAILED_STATES.includes(this.state.type)) {
-                this.context.set(false);
+    createEntry(instantiationService, action, options, anchorAlignment) {
+        this.entry = instantiationService.createInstance(
+            UpdateTitleBarEntry,
+            action,
+            options,
+            anchorAlignment,
+            this.tooltip,
+            focus => {
+                this.tooltipVisible = true;
+                this.tooltipFocused = focus;
+            },
+            () => {
+                this.tooltipVisible = false;
+                this.tooltipFocused = false;
+                if (!ACTIONABLE_STATES.includes(this.state.type) && !DETAILED_STATES.includes(this.state.type)) {
+                    this.context.set(false);
+                }
             }
-        });
+        );
         if (this.tooltipVisible) {
-            this.entry.showTooltip();
+            this.entry.showTooltip(this.tooltipFocused);
         }
         return this.entry;
     }
     async onStateChange(startup = false) {
         if (this.configurationService.getValue(UPDATE_TITLE_BAR_SETTING) === false) {
+            this.tooltipVisible = false;
+            this.tooltipFocused = false;
             this.context.set(false);
             return;
         }
         if (this.tooltipVisible || !(await this.hostService.hadLastFocus())) {
-            this.context.set(ACTIONABLE_STATES.includes(this.state.type));
+            this.context.set(this.tooltipVisible || ACTIONABLE_STATES.includes(this.state.type));
             this.tooltip.renderState(this.state);
             return;
         }
@@ -174,7 +188,9 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
     constructor(
         action,
         options,
+        anchorAlignment,
         tooltip,
+        onDidShowTooltip,
         onUserDismissedTooltip,
         commandService,
         hoverService,
@@ -182,32 +198,41 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
         updateService
     ) {
         super(undefined, action, options);
+        this.anchorAlignment = anchorAlignment;
         this.tooltip = tooltip;
+        this.onDidShowTooltip = onDidShowTooltip;
         this.onUserDismissedTooltip = onUserDismissedTooltip;
         this.commandService = commandService;
         this.hoverService = hoverService;
         this.telemetryService = telemetryService;
         this.updateService = updateService;
-        this.showTooltipOnRender = false;
+        this.visibleTooltip = this._register(( new MutableDisposable()));
         this.action.run = () => this.runAction();
         this._register(this.updateService.onStateChange(state => this.onStateChange(state)));
+        this._register(this.commandService.onDidExecuteCommand(event => {
+            if (event.commandId === "workbench.action.showHover" && this.isFocused()) {
+                this.focusTooltip();
+            }
+        }));
     }
     render(container) {
         super.render(container);
         this.content = append(container, $(".update-indicator"));
+        container.setAttribute("role", "button");
         this.updateTooltip();
         this.onStateChange(this.updateService.state);
-        if (this.showTooltipOnRender) {
-            this.showTooltipOnRender = false;
-            scheduleAtNextAnimationFrame(getWindow(container), () => this.showTooltip());
+        if (this.tooltipFocusOnRender !== undefined) {
+            const focus = this.tooltipFocusOnRender;
+            this.tooltipFocusOnRender = undefined;
+            scheduleAtNextAnimationFrame(getWindow(container), () => this.showTooltip(focus));
         }
     }
     showTooltip(focus = false) {
         if (!this.element?.isConnected) {
-            this.showTooltipOnRender = true;
+            this.tooltipFocusOnRender = focus;
             return;
         }
-        this.hoverService.showInstantHover({
+        const hover = this.hoverService.showInstantHover({
             content: this.tooltip.domNode,
             target: {
                 targetElements: [this.element],
@@ -223,12 +248,31 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
             appearance: {
                 showPointer: true,
                 compact: true
-            }
+            },
+            position: {
+                anchorAlignment: this.anchorAlignment
+            },
+            trapFocus: focus
         }, focus);
+        if (hover) {
+            this.visibleTooltip.value = hover;
+            this.onDidShowTooltip(focus);
+        }
+    }
+    focusTooltip() {
+        this.visibleTooltip.clear();
+        this.showTooltip(true);
     }
     getHoverContents() {
         return this.tooltip.domNode;
     }
+    getHoverOptions() {
+        return {
+            position: {
+                anchorAlignment: this.anchorAlignment
+            }
+        };
+    }
     async runAction() {
         let commandId;
         switch (this.updateService.state.type) {
@@ -261,49 +305,50 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
         const label = append(this.content, $(".indicator-label"));
         switch (state.type) {
         case StateType.Disabled:
-            label.textContent = ( localize(16340, "Update"));
+            label.textContent = ( localize(18404, "Update"));
             this.content.classList.add("update-disabled");
             break;
         case StateType.CheckingForUpdates:
-            label.textContent = ( localize(16341, "Checking..."));
+            label.textContent = ( localize(18405, "Checking..."));
             this.renderProgressState(this.content);
             break;
         case StateType.Overwriting:
-            label.textContent = ( localize(16342, "Updating..."));
+            label.textContent = ( localize(18406, "Updating..."));
             this.renderProgressState(this.content);
             break;
         case StateType.AvailableForDownload:
         case StateType.Downloaded:
         case StateType.Ready:
-            label.textContent = ( localize(16340, "Update"));
+            label.textContent = ( localize(18404, "Update"));
             this.content.classList.add("prominent");
             break;
         case StateType.Downloading:
-            label.textContent = ( localize(16343, "Downloading..."));
+            label.textContent = ( localize(18407, "Downloading..."));
             this.renderProgressState(
                 this.content,
                 computeProgressPercent(state.downloadedBytes, state.totalBytes)
             );
             break;
         case StateType.Updating:
-            label.textContent = ( localize(16344, "Installing..."));
+            label.textContent = ( localize(18408, "Installing..."));
             this.renderProgressState(
                 this.content,
                 computeProgressPercent(state.currentProgress, state.maxProgress)
             );
             break;
         case StateType.Restarting:
-            label.textContent = ( localize(16345, "Restarting..."));
+            label.textContent = ( localize(18409, "Restarting..."));
             this.renderProgressState(this.content);
             break;
         case StateType.Cancelling:
-            label.textContent = ( localize(16346, "Cancelling..."));
+            label.textContent = ( localize(18410, "Cancelling..."));
             this.renderProgressState(this.content);
             break;
         default:
-            label.textContent = ( localize(16340, "Update"));
+            label.textContent = ( localize(18404, "Update"));
             break;
         }
+        this.element?.setAttribute("aria-label", label.textContent);
     }
     renderProgressState(content, percentage) {
         if (percentage !== undefined) {
@@ -314,6 +359,6 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
         }
     }
 };
-UpdateTitleBarEntry = ( __decorate([( __param(4, ICommandService)), ( __param(5, IHoverService)), ( __param(6, ITelemetryService)), ( __param(7, IUpdateService))], UpdateTitleBarEntry));
+UpdateTitleBarEntry = ( __decorate([( __param(6, ICommandService)), ( __param(7, IHoverService)), ( __param(8, ITelemetryService)), ( __param(9, IUpdateService))], UpdateTitleBarEntry));
 
 export { UpdateTitleBarContribution, UpdateTitleBarEntry };

package/vscode/src/vs/workbench/contrib/update/browser/updateTooltip.d.ts

@@ -3,7 +3,6 @@ import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { State } from "@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update";
 /**
@@ -14,7 +13,6 @@ export declare class UpdateTooltip extends Disposable {
     private readonly commandService;
     private readonly configurationService;
     private readonly hoverService;
-    private readonly meteredConnectionService;
     private readonly productService;
     readonly domNode: HTMLElement;
     private readonly titleNode;
@@ -22,8 +20,10 @@ export declare class UpdateTooltip extends Disposable {
     private readonly productNameNode;
     private readonly currentVersionNode;
     private readonly currentVersionCopyValue;
+    private readonly currentVersionCopyButton;
     private readonly latestVersionNode;
     private readonly latestVersionCopyValue;
+    private readonly latestVersionCopyButton;
     private readonly releaseDateNode;
     private readonly progressContainer;
     private readonly progressFill;
@@ -37,7 +37,7 @@ export declare class UpdateTooltip extends Disposable {
     private readonly releaseNotesButton;
     private readonly actionButton;
     private releaseNotesVersion;
-    constructor(clipboardService: IClipboardService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, meteredConnectionService: IMeteredConnectionService, productService: IProductService);
+    constructor(clipboardService: IClipboardService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, productService: IProductService);
     private updateCurrentVersion;
     private hideAll;
     renderState(state: State): void;