@codingame/monaco-vscode-view-banner-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1,2 +1,4 @@
-export * from 'vscode/service-override/viewBanner';
-export { default } from 'vscode/service-override/viewBanner';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+import { BannerPart } from "./vscode/src/vs/workbench/browser/parts/banner/bannerPart.js";
+export default function getServiceOverride(): IEditorOverrideServices;
+export { BannerPart };

package/index.js

@@ -1,2 +1,17 @@
-export { default } from './viewBanner.js';
-export { BannerPart } from './vscode/src/vs/workbench/browser/parts/banner/bannerPart.js';
+
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { BannerPart } from './vscode/src/vs/workbench/browser/parts/banner/bannerPart.js';
+import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
+import { registerServiceInitializePostParticipant } from 'vscode/lifecycle';
+import './vscode/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.js';
+
+function getServiceOverride() {
+    return {
+        [IBannerService.toString()]: new SyncDescriptor(BannerPart, [], false)
+    };
+}
+registerServiceInitializePostParticipant(async (accessor) => {
+    accessor.get(IBannerService);
+});
+
+export { BannerPart, getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-view-banner-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - view-banner service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,13 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - view-banner service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "12.0.1",
+    "@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +29,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

package/vscode/src/vs/workbench/browser/parts/banner/bannerPart.d.ts

@@ -0,0 +1,42 @@
+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 { Part } from "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part";
+import { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IBannerItem } from "vscode/vscode/vs/workbench/services/banner/browser/bannerService";
+import { IBannerService } from "vscode/vscode/vs/workbench/services/banner/browser/bannerService.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare class BannerPart extends Part implements IBannerService {
+    private readonly contextKeyService;
+    private readonly instantiationService;
+    readonly _serviceBrand: undefined;
+    readonly height: number;
+    readonly minimumWidth: number;
+    readonly maximumWidth: number;
+    get minimumHeight(): number;
+    get maximumHeight(): number;
+    private _onDidChangeSize;
+    get onDidChange(): import("vscode/vscode/vs/base/common/event").Event<{
+        width: number;
+        height: number;
+    } | undefined>;
+    private item;
+    private readonly markdownRenderer;
+    private visible;
+    private actionBar;
+    private messageActionsContainer;
+    private focusedActionIndex;
+    constructor(themeService: IThemeService, layoutService: IWorkbenchLayoutService, storageService: IStorageService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService);
+    protected createContentArea(parent: HTMLElement): HTMLElement;
+    private close;
+    private focusActionLink;
+    private getAriaLabel;
+    private getBannerMessage;
+    private setVisibility;
+    focus(): void;
+    focusNextAction(): void;
+    focusPreviousAction(): void;
+    hide(id: string): void;
+    show(item: IBannerItem): void;
+    toJSON(): object;
+}

package/vscode/src/vs/workbench/browser/parts/banner/bannerPart.js

@@ -1,14 +1,17 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/bannerpart.css.js';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { addDisposableListener, EventType, clearNode, isHTMLElement, $, append } from 'vscode/vscode/vs/base/browser/dom';
 import { asCSSUrl } from 'vscode/vscode/vs/base/browser/cssValue';
 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 { Part } from '@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part';
+import { Parts } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/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';
@@ -17,7 +20,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,13 +36,13 @@ 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;
         this.minimumWidth = 0;
         this.maximumWidth = Number.POSITIVE_INFINITY;
-        this._onDidChangeSize = this._register(( (new Emitter())));
+        this._onDidChangeSize = this._register(( new Emitter()));
         this.visible = false;
         this.focusedActionIndex = -1;
         this.markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
@@ -97,7 +101,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);
         }
     }
@@ -152,15 +156,15 @@ let BannerPart = class BannerPart extends Part {
             }
         }
         const actionBarContainer = append(this.element, $('div.action-container'));
-        this.actionBar = this._register(( (new ActionBar(actionBarContainer))));
+        this.actionBar = this._register(( new ActionBar(actionBarContainer)));
         const label = item.closeLabel ?? 'Close Banner';
-        const closeAction = this._register(( (new Action(
+        const closeAction = this._register(( new Action(
             'banner.close',
             label,
             ThemeIcon.asClassName(widgetClose),
             true,
             () => this.close(item)
-        ))));
+        )));
         this.actionBar.push(closeAction, { icon: true, label: false });
         this.actionBar.setFocusable(false);
         this.setVisibility(true);
@@ -168,21 +172,21 @@ let BannerPart = class BannerPart extends Part {
     }
     toJSON() {
         return {
-            type: "workbench.parts.banner"
+            type: Parts.BANNER_PART
         };
     }
 };
-BannerPart = ( (__decorate([
-    ( (__param(0, IThemeService))),
-    ( (__param(1, IWorkbenchLayoutService))),
-    ( (__param(2, IStorageService))),
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IInstantiationService)))
-], BannerPart)));
+BannerPart = ( __decorate([
+    ( __param(0, IThemeService)),
+    ( __param(1, IWorkbenchLayoutService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IInstantiationService))
+], 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 +195,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 +206,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);
@@ -213,7 +217,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 class FocusBannerAction extends Action2 {
     static { this.ID = 'workbench.action.focusBanner'; }
-    static { this.LABEL = ( localize2(3019, "Focus Banner")); }
+    static { this.LABEL = ( localize2(2713, "Focus Banner")); }
     constructor() {
         super({
             id: FocusBannerAction.ID,
@@ -224,7 +228,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/browser/parts/banner/media/bannerpart.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .part.banner{background-color:var(--vscode-banner-background);box-sizing:border-box;color:var(--vscode-banner-foreground);cursor:default;display:flex;font-size:12px;height:100%;overflow:visible;width:100%}.monaco-workbench .part.banner .icon-container{align-items:center;display:flex;flex-shrink:0;padding:0 6px 0 10px}.monaco-workbench .part.banner .icon-container .codicon{color:var(--vscode-banner-iconForeground)}.monaco-workbench .part.banner .icon-container.custom-icon{background-image:url(\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGQ9Ik0xMDI0IDEwMjRIMFYwaDEwMjR2MTAyNHoiIHN0eWxlPSJmaWxsOiNmNmY2ZjY7ZmlsbC1vcGFjaXR5OjAiIGZpbGw9Im5vbmUiLz48cGF0aCBkPSJNMTAyNCA4NS4zMzN2ODUzLjMzM0gwVjg1LjMzM2gxMDI0eiIgc3R5bGU9ImZpbGw6I2ZmZiIvPjxwYXRoIGQ9Ik0wIDg1LjMzM2gyOTguNjY3djg1My4zMzNIMFY4NS4zMzN6bTEwMjQgMHY4NTMuMzMzSDM4NFY4NS4zMzNoNjQwem0tNTU0LjY2NyAxNjBoMzQxLjMzM3YtNjRINDY5LjMzM3Y2NHptMzQxLjMzNCA1MzMuMzM0SDQ2OS4zMzN2NjRoMzQxLjMzM2wuMDAxLTY0em0xMjgtMTQ5LjMzNEg1OTcuMzMzdjY0aDM0MS4zMzNsLjAwMS02NHptMC0xNDkuMzMzSDU5Ny4zMzN2NjRoMzQxLjMzM2wuMDAxLTY0em0wLTE0OS4zMzNINTk3LjMzM3Y2NGgzNDEuMzMzbC4wMDEtNjR6IiBzdHlsZT0iZmlsbDojMTY3YWJmIi8+PC9zdmc+\");background-position:50%;background-repeat:no-repeat;background-size:16px;margin:0 6px 0 10px;padding:0;width:16px}.monaco-workbench .part.banner .message-container{line-height:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part.banner .message-container a{color:var(--vscode-banner-foreground)}.monaco-workbench .part.banner .message-container p{margin-block-end:0;margin-block-start:0}.monaco-workbench .part.banner .message-actions-container{flex-grow:1;flex-shrink:0;line-height:26px}.monaco-workbench .part.banner .message-actions-container a{color:var(--vscode-banner-foreground);cursor:pointer;margin-left:12px;padding:3px;text-decoration:underline}.monaco-workbench .part.banner .message-container a{cursor:pointer;text-decoration:underline}.monaco-workbench .part.banner .action-container{padding:0 10px 0 6px}.monaco-workbench .part.banner .action-container .codicon{color:var(--vscode-banner-foreground)}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,7 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+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 +19,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 +35,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 +46,4 @@ WelcomeBannerContribution = WelcomeBannerContribution_1 = ( __decorate([
     ( __param(2, IBrowserWorkbenchEnvironmentService))
 ], WelcomeBannerContribution));
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(WelcomeBannerContribution, 3 );
+    .registerWorkbenchContribution(WelcomeBannerContribution, LifecyclePhase.Restored);

package/viewBanner.js

@@ -1,16 +0,0 @@
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { BannerPart } from './vscode/src/vs/workbench/browser/parts/banner/bannerPart.js';
-import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
-import { registerServiceInitializePostParticipant } from 'vscode/lifecycle';
-import './vscode/src/vs/workbench/contrib/welcomeBanner/browser/welcomeBanner.contribution.js';
-
-function getServiceOverride() {
-    return {
-        [( IBannerService.toString())]: new SyncDescriptor(BannerPart, [], false)
-    };
-}
-registerServiceInitializePostParticipant(async (accessor) => {
-    accessor.get(IBannerService);
-});
-
-export { BannerPart, getServiceOverride as default };