@codingame/monaco-vscode-view-banner-service-override 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-banner-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/browser/parts/banner/bannerPart.js

@@ -1,13 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/bannerpart.css.js';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { addDisposableListener, EventType, clearNode, $, append, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
+import { addDisposableListener, EventType, clearNode, isHTMLElement, $, append, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
+import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
@@ -16,7 +18,8 @@ import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/brows
 import { MarkdownRenderer } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
@@ -32,7 +35,7 @@ let BannerPart = class BannerPart extends Part {
     }
     get onDidChange() { return this._onDidChangeSize.event; }
     constructor(themeService, layoutService, storageService, contextKeyService, instantiationService) {
-        super("workbench.parts.banner" , { hasTitle: false }, themeService, storageService, layoutService);
+        super(Parts.BANNER_PART, { hasTitle: false }, themeService, storageService, layoutService);
         this.contextKeyService = contextKeyService;
         this.instantiationService = instantiationService;
         this.height = 26;
@@ -67,7 +70,7 @@ let BannerPart = class BannerPart extends Part {
         const length = this.item?.actions?.length ?? 0;
         if (this.focusedActionIndex < length) {
             const actionLink = this.messageActionsContainer?.children[this.focusedActionIndex];
-            if (actionLink instanceof HTMLElement) {
+            if (isHTMLElement(actionLink)) {
                 this.actionBar?.setFocusable(false);
                 actionLink.focus();
             }
@@ -97,7 +100,7 @@ let BannerPart = class BannerPart extends Part {
         if (visible !== this.visible) {
             this.visible = visible;
             this.focusedActionIndex = -1;
-            this.layoutService.setPartHidden(!visible, "workbench.parts.banner" );
+            this.layoutService.setPartHidden(!visible, Parts.BANNER_PART);
             this._onDidChangeSize.fire(undefined);
         }
     }
@@ -168,7 +171,7 @@ let BannerPart = class BannerPart extends Part {
     }
     toJSON() {
         return {
-            type: "workbench.parts.banner"
+            type: Parts.BANNER_PART
         };
     }
 };
@@ -181,8 +184,8 @@ BannerPart = ( (__decorate([
 ], BannerPart)));
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.banner.focusBanner',
-    weight: 200 ,
-    primary: 9 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.Escape,
     when: BannerFocused,
     handler: (accessor) => {
         const bannerService = accessor.get(IBannerService);
@@ -191,9 +194,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.banner.focusNextAction',
-    weight: 200 ,
-    primary: 17 ,
-    secondary: [18 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.RightArrow,
+    secondary: [KeyCode.DownArrow],
     when: BannerFocused,
     handler: (accessor) => {
         const bannerService = accessor.get(IBannerService);
@@ -202,9 +205,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.banner.focusPreviousAction',
-    weight: 200 ,
-    primary: 15 ,
-    secondary: [16 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.LeftArrow,
+    secondary: [KeyCode.UpArrow],
     when: BannerFocused,
     handler: (accessor) => {
         const bannerService = accessor.get(IBannerService);
@@ -224,7 +227,7 @@ class FocusBannerAction extends Action2 {
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
-        layoutService.focusPart("workbench.parts.banner" );
+        layoutService.focusPart(Parts.BANNER_PART);
     }
 }
 registerAction2(FocusBannerAction);

package/vscode/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.js

@@ -1,7 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -16,7 +18,7 @@ let WelcomeBannerContribution = class WelcomeBannerContribution {
         if (!welcomeBanner) {
             return;
         }
-        if (storageService.getBoolean(WelcomeBannerContribution_1.WELCOME_BANNER_DISMISSED_KEY, 0 , false)) {
+        if (storageService.getBoolean(WelcomeBannerContribution_1.WELCOME_BANNER_DISMISSED_KEY, StorageScope.PROFILE, false)) {
             return;
         }
         let icon = undefined;
@@ -32,7 +34,7 @@ let WelcomeBannerContribution = class WelcomeBannerContribution {
             icon,
             actions: welcomeBanner.actions,
             onClose: () => {
-                storageService.store(WelcomeBannerContribution_1.WELCOME_BANNER_DISMISSED_KEY, true, 0 , 1 );
+                storageService.store(WelcomeBannerContribution_1.WELCOME_BANNER_DISMISSED_KEY, true, StorageScope.PROFILE, StorageTarget.MACHINE);
             }
         });
     }
@@ -43,4 +45,4 @@ WelcomeBannerContribution = WelcomeBannerContribution_1 = ( __decorate([
     ( __param(2, IBrowserWorkbenchEnvironmentService))
 ], WelcomeBannerContribution));
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(WelcomeBannerContribution, 3 );
+    .registerWorkbenchContribution(WelcomeBannerContribution, LifecyclePhase.Restored);