@codingame/monaco-vscode-notifications-service-override 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notifications-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/vscode/src/vs/workbench/services/notification/common/notificationService.js

@@ -2,10 +2,12 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isNotificationSource, NotificationsFilter, NoOpNotification, NeverShowAgainScope } from 'vscode/vscode/vs/platform/notification/common/notification';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { NotificationsModel, ChoiceAction } from 'vscode/vscode/vs/workbench/common/notifications';
+import { NotificationsModel, NotificationChangeType, ChoiceAction } from 'vscode/vscode/vs/workbench/common/notifications';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
@@ -23,10 +25,10 @@ let NotificationService = class NotificationService extends Disposable {
         this.onDidRemoveNotification = this._onDidRemoveNotification.event;
         this._onDidChangeFilter = this._register(( (new Emitter())));
         this.onDidChangeFilter = this._onDidChangeFilter.event;
-        this.globalFilterEnabled = this.storageService.getBoolean(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, -1 , false);
+        this.globalFilterEnabled = this.storageService.getBoolean(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, false);
         this.mapSourceToFilter = (() => {
             const map = ( (new Map()));
-            for (const sourceFilter of this.storageService.getObject(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, -1 , [])) {
+            for (const sourceFilter of this.storageService.getObject(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, [])) {
                 map.set(sourceFilter.id, sourceFilter);
             }
             return map;
@@ -37,8 +39,8 @@ let NotificationService = class NotificationService extends Disposable {
     registerListeners() {
         this._register(this.model.onDidChangeNotification(e => {
             switch (e.kind) {
-                case 0 :
-                case 3 : {
+                case NotificationChangeType.ADD:
+                case NotificationChangeType.REMOVE: {
                     const source = typeof e.item.sourceId === 'string' && typeof e.item.source === 'string' ? { id: e.item.sourceId, label: e.item.source } : e.item.source;
                     const notification = {
                         message: e.item.message.original,
@@ -46,7 +48,7 @@ let NotificationService = class NotificationService extends Disposable {
                         source,
                         priority: e.item.priority
                     };
-                    if (e.kind === 0 ) {
+                    if (e.kind === NotificationChangeType.ADD) {
                         if (isNotificationSource(source)) {
                             if (!( (this.mapSourceToFilter.has(source.id)))) {
                                 this.setFilter({ ...source, filter: NotificationsFilter.OFF });
@@ -57,7 +59,7 @@ let NotificationService = class NotificationService extends Disposable {
                         }
                         this._onDidAddNotification.fire(notification);
                     }
-                    if (e.kind === 3 ) {
+                    if (e.kind === NotificationChangeType.REMOVE) {
                         this._onDidRemoveNotification.fire(notification);
                     }
                     break;
@@ -73,7 +75,7 @@ let NotificationService = class NotificationService extends Disposable {
                 return;
             }
             this.globalFilterEnabled = filter === NotificationsFilter.ERROR;
-            this.storageService.store(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, this.globalFilterEnabled, -1 , 1 );
+            this.storageService.store(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, this.globalFilterEnabled, StorageScope.APPLICATION, StorageTarget.MACHINE);
             this.updateFilters();
             this._onDidChangeFilter.fire();
         }
@@ -104,7 +106,7 @@ let NotificationService = class NotificationService extends Disposable {
         }
     }
     saveSourceFilters() {
-        this.storageService.store(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, JSON.stringify([...( (this.mapSourceToFilter.values()))]), -1 , 1 );
+        this.storageService.store(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, JSON.stringify([...( (this.mapSourceToFilter.values()))]), StorageScope.APPLICATION, StorageTarget.MACHINE);
     }
     getFilters() {
         return [...( (this.mapSourceToFilter.values()))];
@@ -162,7 +164,7 @@ let NotificationService = class NotificationService extends Disposable {
             }
             const neverShowAgainAction = toDispose.add(( (new Action('workbench.notification.neverShowAgain', ( localizeWithPath(_moduleId, 0, "Don't Show Again")), undefined, true, async () => {
                 handle.close();
-                this.storageService.store(id, true, scope, 0 );
+                this.storageService.store(id, true, scope, StorageTarget.USER);
             }))));
             const actions = {
                 primary: notification.actions?.primary || [],
@@ -183,13 +185,13 @@ let NotificationService = class NotificationService extends Disposable {
     toStorageScope(options) {
         switch (options.scope) {
             case NeverShowAgainScope.APPLICATION:
-                return -1 ;
+                return StorageScope.APPLICATION;
             case NeverShowAgainScope.PROFILE:
-                return 0 ;
+                return StorageScope.PROFILE;
             case NeverShowAgainScope.WORKSPACE:
-                return 1 ;
+                return StorageScope.WORKSPACE;
             default:
-                return -1 ;
+                return StorageScope.APPLICATION;
         }
     }
     prompt(severity, message, choices, options) {
@@ -204,7 +206,7 @@ let NotificationService = class NotificationService extends Disposable {
             }
             const neverShowAgainChoice = {
                 label: ( localizeWithPath(_moduleId, 0, "Don't Show Again")),
-                run: () => this.storageService.store(id, true, scope, 0 ),
+                run: () => this.storageService.store(id, true, scope, StorageTarget.USER),
                 isSecondary: options.neverShowAgain.isSecondary
             };
             if (!options.neverShowAgain.isSecondary) {