development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124621 from microsoft/roblou/diffNotificationMessage

Browse source 
Don't rerender notification when content did not change
This commit is contained in:
Rob Lourens 2021-05-25 23:01:41 -07:00 committed by GitHub
parent 5cc9ec944d
commit fe1547c251
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/common/notifications.ts
View file

@ -619,13 +619,17 @@ export class NotificationViewItem extends Disposable implements INotificationVie
}
updateSeverity(severity: Severity): void {
if (severity === this._severity) {
return;
}
this._severity = severity;
this._onDidChangeContent.fire({ kind: NotificationViewItemContentChangeKind.SEVERITY });
}
updateMessage(input: NotificationMessage): void {
const message = NotificationViewItem.parseNotificationMessage(input);
if (!message) {
if (!message || message.raw === this._message.raw) {
return;
}

26
src/vs/workbench/test/common/notifications.test.ts
View file

@ -10,6 +10,7 @@ import { INotification, Severity, NotificationsFilter } from 'vs/platform/notifi
import { createErrorWithActions } from 'vs/base/common/errors';
import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
import { timeout } from 'vs/base/common/async';
suite('Notifications', () => {
@ -143,6 +144,23 @@ suite('Notifications', () => {
assert.strictEqual(item11.silent, true);
});
test('Items - does not fire changed when message did not change (content, severity)', async () => {
const item1 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' })!;
let fired = false;
item1.onDidChangeContent(() => {
fired = true;
});
item1.updateMessage('Error Message');
await timeout(0);
assert.ok(!fired, 'Expected onDidChangeContent to not be fired');
item1.updateSeverity(Severity.Error);
await timeout(0);
assert.ok(!fired, 'Expected onDidChangeContent to not be fired');
});
test('Model', () => {
const model = new NotificationsModel();
@ -167,11 +185,11 @@ suite('Notifications', () => {
assert.strictEqual(lastNotificationEvent.index, 0);
assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.ADD);
item1Handle.updateMessage('Error Message');
item1Handle.updateMessage('Different Error Message');
assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.MESSAGE);
item1Handle.updateSeverity(Severity.Error);
item1Handle.updateSeverity(Severity.Warning);
assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.SEVERITY);
@ -205,8 +223,8 @@ suite('Notifications', () => {
item1Handle.close();
assert.strictEqual(called, 1);
assert.strictEqual(model.notifications.length, 2);
assert.strictEqual(lastNotificationEvent.item.severity, item1.severity);
assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item1.message);
assert.strictEqual(lastNotificationEvent.item.severity, Severity.Warning);
assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), 'Different Error Message');
assert.strictEqual(lastNotificationEvent.index, 2);
assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.REMOVE);