notificationFilter.ERROR

isidorn · isidorn · commit 00de15d76597 · 2019-10-18T10:41:55.000+02:00
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
@@ -238,7 +238,12 @@ export enum NotificationsFilter {
 	 * All notifications are configured as silent. See
 	 * `INotificationProperties.silent` for more info.
 	 */
-	SILENT
+	SILENT,
+
+	/**
+	 * All notifications are silent except error notifications.
+	*/
+	ERROR
 }
 
 /**
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
@@ -685,7 +685,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 			this.state.zenMode.setNotificationsFilter = config.silentNotifications;
 			if (config.silentNotifications) {
-				this.notificationService.setFilter(NotificationsFilter.SILENT);
+				this.notificationService.setFilter(NotificationsFilter.ERROR);
 			}
 
 			if (config.centerLayout) {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -95,7 +95,7 @@ export class NotificationsToasts extends Themable {
 
 		// Filter
 		this._register(this.model.onDidFilterChange(filter => {
-			if (filter === NotificationsFilter.SILENT) {
+			if (filter === NotificationsFilter.SILENT || filter === NotificationsFilter.ERROR) {
 				this.hide();
 			}
 		}));
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
@@ -438,7 +438,7 @@ export class NotificationViewItem extends Disposable implements INotificationVie
 			actions = { primary: notification.message.actions };
 		}
 
-		return new NotificationViewItem(severity, notification.sticky, notification.silent || filter === NotificationsFilter.SILENT, message, notification.source, actions);
+		return new NotificationViewItem(severity, notification.sticky, notification.silent || filter === NotificationsFilter.SILENT || (filter === NotificationsFilter.ERROR && notification.severity !== Severity.Error), message, notification.source, actions);
 	}
 
 	private static parseNotificationMessage(input: NotificationMessage): INotificationMessage | undefined {
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
@@ -134,6 +134,12 @@ suite('Notifications', () => {
 
 		let item9 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' }, NotificationsFilter.OFF)!;
 		assert.equal(item9.silent, false);
+
+		let item10 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' }, NotificationsFilter.ERROR)!;
+		assert.equal(item10.silent, false);
+
+		let item11 = NotificationViewItem.create({ severity: Severity.Warning, message: 'Error Message' }, NotificationsFilter.ERROR)!;
+		assert.equal(item11.silent, true);
 	});
 
 	test('Model', () => {

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi`
`685`	`685`
`686`	`686`	`this.state.zenMode.setNotificationsFilter = config.silentNotifications;`
`687`	`687`	`if (config.silentNotifications) {`
`688`		`- this.notificationService.setFilter(NotificationsFilter.SILENT);`
	`688`	`+ this.notificationService.setFilter(NotificationsFilter.ERROR);`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`if (config.centerLayout) {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export class NotificationsToasts extends Themable {`
`95`	`95`
`96`	`96`	`// Filter`
`97`	`97`	`this._register(this.model.onDidFilterChange(filter => {`
`98`		`- if (filter === NotificationsFilter.SILENT) {`
	`98`	`+ if (filter === NotificationsFilter.SILENT \|\| filter === NotificationsFilter.ERROR) {`
`99`	`99`	`this.hide();`
`100`	`100`	`}`
`101`	`101`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ export class NotificationViewItem extends Disposable implements INotificationVie`
`438`	`438`	`actions = { primary: notification.message.actions };`
`439`	`439`	`}`
`440`	`440`
`441`		`- return new NotificationViewItem(severity, notification.sticky, notification.silent \|\| filter === NotificationsFilter.SILENT, message, notification.source, actions);`
	`441`	`+ return new NotificationViewItem(severity, notification.sticky, notification.silent \|\| filter === NotificationsFilter.SILENT \|\| (filter === NotificationsFilter.ERROR && notification.severity !== Severity.Error), message, notification.source, actions);`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`private static parseNotificationMessage(input: NotificationMessage): INotificationMessage \| undefined {`