From c6567bcf69d8fb74e1d42018f29ccd3bc34fb516 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 29 Jun 2023 12:16:46 +0200
Subject: [PATCH] notifications - compute height properly when progress is
 enabled (#186612)

---
 .../browser/parts/notifications/notificationsList.ts      | 2 +-
 .../browser/parts/notifications/notificationsToasts.ts    | 8 ++++----
 .../browser/parts/notifications/notificationsViewer.ts    | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 57c31863c48..f54137e9371 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -21,7 +21,7 @@ import { AriaRole } from 'vs/base/browser/ui/aria/aria';
 import { NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 
 export interface INotificationsListOptions extends IListOptions<INotificationViewItem> {
-	widgetAriaLabel?: string;
+	readonly widgetAriaLabel?: string;
 }
 
 export class NotificationsList extends Disposable {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 55c691f02a6..62d27bfc8ec 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -27,10 +27,10 @@ import { assertIsDefined } from 'vs/base/common/types';
 import { NotificationsToastsVisibleContext } from 'vs/workbench/common/contextkeys';
 
 interface INotificationToast {
-	item: INotificationViewItem;
-	list: NotificationsList;
-	container: HTMLElement;
-	toast: HTMLElement;
+	readonly item: INotificationViewItem;
+	readonly list: NotificationsList;
+	readonly container: HTMLElement;
+	readonly toast: HTMLElement;
 }
 
 enum ToastVisibility {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 03a4bb4f404..0be6eaf64c0 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -83,7 +83,10 @@ export class NotificationsListDelegate implements IListVirtualDelegate<INotifica
 	private computePreferredHeight(notification: INotificationViewItem): number {
 
 		// Prepare offset helper depending on toolbar actions count
-		let actions = 1; // close
+		let actions = 0;
+		if (!notification.hasProgress) {
+			actions++; // close
+		}
 		if (notification.canCollapse) {
 			actions++; // expand/collapse
 		}
@@ -132,8 +135,9 @@ export interface INotificationTemplateData {
 }
 
 interface IMessageActionHandler {
+	readonly toDispose: DisposableStore;
+
 	callback: (href: string) => void;
-	toDispose: DisposableStore;
 }
 
 class NotificationMessageRenderer {