@codingame/monaco-vscode-welcome-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/welcome';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,9 @@
-export { default } from './welcome.js';
+
+import './vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.js';
+import './vscode/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.js';
+
+function getServiceOverride() {
+    return {};
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-welcome-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - welcome service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,11 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - welcome service-override",
+  "dependencies": {
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +27,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/contrib/welcomeViews/common/newFile.contribution.d.ts

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

package/vscode/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.js

@@ -1,5 +1,7 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { promiseWithResolvers } from 'vscode/vscode/vs/base/common/async';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
@@ -8,23 +10,25 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 var NewFileTemplatesManager_1;
-const builtInSource = ( localize(3009, "Built-In"));
-const category = ( localize2(3010, 'Create'));
+const builtInSource = ( localize(10969, "Built-In"));
+const category = ( localize2(10970, 'Create'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.showNewFileEntries',
-            title: ( localize2(3011, 'New File...')),
+            title: ( localize2(10971, 'New File...')),
             category,
             f1: true,
             keybinding: {
-                primary: 512  + 2048  + 256  + 44 ,
-                weight: 200 ,
+                primary: KeyMod.Alt + KeyMod.CtrlCmd + KeyMod.WinCtrl + KeyCode.KeyN,
+                weight: KeybindingWeight.WorkbenchContrib,
             },
             menu: {
                 id: MenuId.MenubarFileMenu,
@@ -77,10 +81,10 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
     }
     async selectNewEntry(entries) {
         const { promise: resultPromise, resolve: resolveResult } = promiseWithResolvers();
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const qp = this.quickInputService.createQuickPick({ useSeparators: true });
-        qp.title = ( localize(3012, "New File..."));
-        qp.placeholder = ( localize(3013, "Select File Type or Enter File Name..."));
+        qp.title = ( localize(10972, "New File..."));
+        qp.placeholder = ( localize(10973, "Select File Type or Enter File Name..."));
         qp.sortByLabel = false;
         qp.matchOnDetail = true;
         qp.matchOnDescription = true;
@@ -106,8 +110,8 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
             return a.from.localeCompare(b.from);
         };
         const displayCategory = {
-            'file': ( localize(3014, "File")),
-            'notebook': ( localize(3015, "Notebook")),
+            'file': ( localize(10974, "File")),
+            'notebook': ( localize(10975, "Notebook")),
         };
         const refreshQp = (entries) => {
             const items = [];
@@ -132,7 +136,7 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
                     buttons: command ? [
                         {
                             iconClass: 'codicon codicon-gear',
-                            tooltip: ( localize(3016, "Configure Keybinding"))
+                            tooltip: ( localize(10976, "Configure Keybinding"))
                         }
                     ] : [],
                     detail: '',
@@ -151,7 +155,7 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
             const currentTextEntry = {
                 commandID: 'workbench.action.files.newFile',
                 commandArgs: { languageId: undefined, viewType: undefined, fileName: val },
-                title: ( localize(3017, "Create New File ({0})", val)),
+                title: ( localize(10977, "Create New File ({0})", val)),
                 group: 'file',
                 from: builtInSource,
             };
@@ -179,20 +183,20 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
         return resultPromise;
     }
 };
-NewFileTemplatesManager = NewFileTemplatesManager_1 = ( (__decorate([
-    ( (__param(0, IQuickInputService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, ICommandService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, IMenuService)))
-], NewFileTemplatesManager)));
-( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(NewFileTemplatesManager, 3 );
+NewFileTemplatesManager = NewFileTemplatesManager_1 = ( __decorate([
+    ( __param(0, IQuickInputService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, ICommandService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IMenuService))
+], NewFileTemplatesManager));
+( Registry.as(Extensions.Workbench))
+    .registerWorkbenchContribution(NewFileTemplatesManager, LifecyclePhase.Restored);
 MenuRegistry.appendMenuItem(MenuId.NewFile, {
     group: 'file',
     command: {
         id: 'workbench.action.files.newUntitledFile',
-        title: ( localize(3018, "Text File"))
+        title: ( localize(10978, "Text File"))
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.d.ts

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

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.js

@@ -1,5 +1,7 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+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 { ViewsWelcomeContribution } from './viewsWelcomeContribution.js';
@@ -16,4 +18,4 @@ WorkbenchConfigurationContribution = ( __decorate([
     ( __param(0, IInstantiationService))
 ], WorkbenchConfigurationContribution));
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(WorkbenchConfigurationContribution, 3 );
+    .registerWorkbenchContribution(WorkbenchConfigurationContribution, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.d.ts

@@ -0,0 +1,8 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IExtensionPoint } from "vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry";
+import { ViewsWelcomeExtensionPoint } from "./viewsWelcomeExtensionPoint.js";
+export declare class ViewsWelcomeContribution extends Disposable implements IWorkbenchContribution {
+    private viewWelcomeContents;
+    constructor(extensionPoint: IExtensionPoint<ViewsWelcomeExtensionPoint>);
+}

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.js

@@ -1,3 +1,4 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -6,11 +7,11 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
-const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
+const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 class ViewsWelcomeContribution extends Disposable {
     constructor(extensionPoint) {
         super();
-        this.viewWelcomeContents = ( (new Map()));
+        this.viewWelcomeContents = ( new Map());
         extensionPoint.setHandler((_, { added, removed }) => {
             for (const contribution of removed) {
                 for (const welcome of contribution.value) {
@@ -18,7 +19,7 @@ class ViewsWelcomeContribution extends Disposable {
                     disposable?.dispose();
                 }
             }
-            const welcomesByViewId = ( (new Map()));
+            const welcomesByViewId = ( new Map());
             for (const contribution of added) {
                 for (const welcome of contribution.value) {
                     const { group, order } = parseGroupAndOrder(welcome, contribution);
@@ -26,7 +27,7 @@ class ViewsWelcomeContribution extends Disposable {
                     const id = ViewIdentifierMap[welcome.view] ?? welcome.view;
                     let viewContentMap = welcomesByViewId.get(id);
                     if (!viewContentMap) {
-                        viewContentMap = ( (new Map()));
+                        viewContentMap = ( new Map());
                         welcomesByViewId.set(id, viewContentMap);
                     }
                     viewContentMap.set(welcome, {
@@ -53,7 +54,7 @@ function parseGroupAndOrder(welcome, contribution) {
     if (welcome.group) {
         if (!isProposedApiEnabled(contribution.description, 'contribViewsWelcome')) {
             contribution.collector.warn(( localize(
-                6759,
+                10979,
                 "The viewsWelcome contribution in '{0}' requires 'enabledApiProposals: [\"contribViewsWelcome\"]' in order to use the 'group' proposed property.",
                 contribution.description.identifier.value
             )));

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.d.ts

@@ -0,0 +1,23 @@
+import { IConfigurationPropertySchema } from "vscode/vscode/vs/platform/configuration/common/configurationRegistry";
+export declare enum ViewsWelcomeExtensionPointFields {
+    view = "view",
+    contents = "contents",
+    when = "when",
+    group = "group",
+    enablement = "enablement"
+}
+export interface ViewWelcome {
+    readonly [ViewsWelcomeExtensionPointFields.view]: string;
+    readonly [ViewsWelcomeExtensionPointFields.contents]: string;
+    readonly [ViewsWelcomeExtensionPointFields.when]: string;
+    readonly [ViewsWelcomeExtensionPointFields.group]: string;
+    readonly [ViewsWelcomeExtensionPointFields.enablement]: string;
+}
+export type ViewsWelcomeExtensionPoint = ViewWelcome[];
+export declare const ViewIdentifierMap: {
+    [key: string]: string;
+};
+export declare const viewsWelcomeExtensionPointDescriptor: {
+    extensionPoint: string;
+    jsonSchema: Readonly<IConfigurationPropertySchema>;
+};

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.js

@@ -1,30 +1,29 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 
 var ViewsWelcomeExtensionPointFields;
-( ((function(ViewsWelcomeExtensionPointFields) {
+(function (ViewsWelcomeExtensionPointFields) {
     ViewsWelcomeExtensionPointFields["view"] = "view";
     ViewsWelcomeExtensionPointFields["contents"] = "contents";
     ViewsWelcomeExtensionPointFields["when"] = "when";
     ViewsWelcomeExtensionPointFields["group"] = "group";
     ViewsWelcomeExtensionPointFields["enablement"] = "enablement";
-})(
-    ViewsWelcomeExtensionPointFields || (ViewsWelcomeExtensionPointFields = {})
-)));
+})(ViewsWelcomeExtensionPointFields || (ViewsWelcomeExtensionPointFields = {}));
 const ViewIdentifierMap = {
     'explorer': 'workbench.explorer.emptyView',
     'debug': 'workbench.debug.welcome',
     'scm': 'workbench.scm',
     'testing': 'workbench.view.testing'
 };
-const viewsWelcomeExtensionPointSchema = ( (Object.freeze({
+const viewsWelcomeExtensionPointSchema = ( Object.freeze({
     type: 'array',
     description: ( localize(
-        6760,
+        10980,
         "Contributed views welcome content. Welcome content will be rendered in tree based views whenever they have no meaningful content to display, ie. the File Explorer when no folder is open. Such content is useful as in-product documentation to drive users to use certain features before they are available. A good example would be a `Clone Repository` button in the File Explorer welcome view."
     )),
     items: {
         type: 'object',
-        description: ( localize(6761, "Contributed welcome content for a specific view.")),
+        description: ( localize(10981, "Contributed welcome content for a specific view.")),
         required: [
             ViewsWelcomeExtensionPointFields.view,
             ViewsWelcomeExtensionPointFields.contents
@@ -35,45 +34,45 @@ const viewsWelcomeExtensionPointSchema = ( (Object.freeze({
                     {
                         type: 'string',
                         description: ( localize(
-                            6762,
+                            10982,
                             "Target view identifier for this welcome content. Only tree based views are supported."
                         ))
                     },
                     {
                         type: 'string',
                         description: ( localize(
-                            6762,
+                            10982,
                             "Target view identifier for this welcome content. Only tree based views are supported."
                         )),
-                        enum: ( (Object.keys(ViewIdentifierMap)))
+                        enum: ( Object.keys(ViewIdentifierMap))
                     }
                 ]
             },
             [ViewsWelcomeExtensionPointFields.contents]: {
                 type: 'string',
                 description: ( localize(
-                    6763,
+                    10983,
                     "Welcome content to be displayed. The format of the contents is a subset of Markdown, with support for links only."
                 )),
             },
             [ViewsWelcomeExtensionPointFields.when]: {
                 type: 'string',
-                description: ( localize(6764, "Condition when the welcome content should be displayed.")),
+                description: ( localize(10984, "Condition when the welcome content should be displayed.")),
             },
             [ViewsWelcomeExtensionPointFields.group]: {
                 type: 'string',
-                description: ( localize(6765, "Group to which this welcome content belongs. Proposed API.")),
+                description: ( localize(10985, "Group to which this welcome content belongs. Proposed API.")),
             },
             [ViewsWelcomeExtensionPointFields.enablement]: {
                 type: 'string',
                 description: ( localize(
-                    6766,
+                    10986,
                     "Condition when the welcome content buttons and command links should be enabled."
                 )),
             },
         }
     }
-})));
+}));
 const viewsWelcomeExtensionPointDescriptor = {
     extensionPoint: 'viewsWelcome',
     jsonSchema: viewsWelcomeExtensionPointSchema

package/welcome.js

@@ -1,8 +0,0 @@
-import './vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.js';
-import './vscode/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.js';
-
-function getServiceOverride() {
-    return {};
-}
-
-export { getServiceOverride as default };