@codingame/monaco-vscode-welcome-service-override 18.4.0 → 19.0.1

package/index.js

@@ -1,14 +1,9 @@
 
 import './vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution.js';
 import './vscode/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.js';
-import { IGettingStartedExperimentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service';
-import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { GettingStartedExperimentService } from './vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.js';
 
 function getServiceOverride() {
-    return {
-        [IGettingStartedExperimentService.toString()]: new SyncDescriptor(GettingStartedExperimentService, [], true)
-    };
+    return {};
 }
 
 export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-welcome-service-override",
-  "version": "18.4.0",
+  "version": "19.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - welcome service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "18.4.0"
+    "@codingame/monaco-vscode-api": "19.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { promiseWithResolvers } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { assertIsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId, MenuItemAction, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -17,13 +17,13 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 var NewFileTemplatesManager_1;
-const builtInSource = ( localize(12041, "Built-In"));
-const category = ( localize2(12042, 'Create'));
+const builtInSource = ( localize(12313, "Built-In"));
+const category = ( localize2(12314, 'Create'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.showNewFileEntries',
-            title: ( localize2(12043, 'New File...')),
+            title: ( localize2(12315, 'New File...')),
             category,
             f1: true,
             keybinding: {
@@ -38,7 +38,7 @@ registerAction2(class extends Action2 {
         });
     }
     async run(accessor) {
-        return assertIsDefined(NewFileTemplatesManager.Instance).run();
+        return assertReturnsDefined(NewFileTemplatesManager.Instance).run();
     }
 });
 let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
@@ -83,8 +83,8 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
         const { promise: resultPromise, resolve: resolveResult } = promiseWithResolvers();
         const disposables = ( new DisposableStore());
         const qp = this.quickInputService.createQuickPick({ useSeparators: true });
-        qp.title = ( localize(12044, "New File..."));
-        qp.placeholder = ( localize(12045, "Select File Type or Enter File Name..."));
+        qp.title = ( localize(12316, "New File..."));
+        qp.placeholder = ( localize(12317, "Select File Type or Enter File Name..."));
         qp.sortByLabel = false;
         qp.matchOnDetail = true;
         qp.matchOnDescription = true;
@@ -110,8 +110,8 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
             return a.from.localeCompare(b.from);
         };
         const displayCategory = {
-            'file': ( localize(12046, "File")),
-            'notebook': ( localize(12047, "Notebook")),
+            'file': ( localize(12318, "File")),
+            'notebook': ( localize(12319, "Notebook")),
         };
         const refreshQp = (entries) => {
             const items = [];
@@ -136,7 +136,7 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
                     buttons: command ? [
                         {
                             iconClass: 'codicon codicon-gear',
-                            tooltip: ( localize(12048, "Configure Keybinding"))
+                            tooltip: ( localize(12320, "Configure Keybinding"))
                         }
                     ] : [],
                     detail: '',
@@ -155,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(12049, "Create New File ({0})", val)),
+                title: ( localize(12321, "Create New File ({0})", val)),
                 group: 'file',
                 from: builtInSource,
             };
@@ -196,7 +196,7 @@ MenuRegistry.appendMenuItem(MenuId.NewFile, {
     group: 'file',
     command: {
         id: 'workbench.action.files.newUntitledFile',
-        title: ( localize(12050, "Text File"))
+        title: ( localize(12322, "Text File"))
     },
     order: 1
 });

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

@@ -54,7 +54,7 @@ function parseGroupAndOrder(welcome, contribution) {
     if (welcome.group) {
         if (!isProposedApiEnabled(contribution.description, 'contribViewsWelcome')) {
             contribution.collector.warn(( localize(
-                12051,
+                12323,
                 "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.js

@@ -18,12 +18,12 @@ const ViewIdentifierMap = {
 const viewsWelcomeExtensionPointSchema = ( Object.freeze({
     type: 'array',
     description: ( localize(
-        12052,
+        12324,
         "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(12053, "Contributed welcome content for a specific view.")),
+        description: ( localize(12325, "Contributed welcome content for a specific view.")),
         required: [
             ViewsWelcomeExtensionPointFields.view,
             ViewsWelcomeExtensionPointFields.contents
@@ -34,14 +34,14 @@ const viewsWelcomeExtensionPointSchema = ( Object.freeze({
                     {
                         type: 'string',
                         description: ( localize(
-                            12054,
+                            12326,
                             "Target view identifier for this welcome content. Only tree based views are supported."
                         ))
                     },
                     {
                         type: 'string',
                         description: ( localize(
-                            12054,
+                            12326,
                             "Target view identifier for this welcome content. Only tree based views are supported."
                         )),
                         enum: ( Object.keys(ViewIdentifierMap))
@@ -51,22 +51,22 @@ const viewsWelcomeExtensionPointSchema = ( Object.freeze({
             [ViewsWelcomeExtensionPointFields.contents]: {
                 type: 'string',
                 description: ( localize(
-                    12055,
+                    12327,
                     "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(12056, "Condition when the welcome content should be displayed.")),
+                description: ( localize(12328, "Condition when the welcome content should be displayed.")),
             },
             [ViewsWelcomeExtensionPointFields.group]: {
                 type: 'string',
-                description: ( localize(12057, "Group to which this welcome content belongs. Proposed API.")),
+                description: ( localize(12329, "Group to which this welcome content belongs. Proposed API.")),
             },
             [ViewsWelcomeExtensionPointFields.enablement]: {
                 type: 'string',
                 description: ( localize(
-                    12058,
+                    12330,
                     "Condition when the welcome content buttons and command links should be enabled."
                 )),
             },

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.d.ts

@@ -1,29 +0,0 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IGettingStartedExperimentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service";
-export interface IGettingStartedExperiment {
-    cohort: number;
-    experimentGroup: string;
-    walkthroughId: string;
-    iteration: number;
-}
-export declare enum GettingStartedExperimentGroup {
-    New = "newExp",
-    Control = "controlExp",
-    Default = "defaultExp"
-}
-export declare class GettingStartedExperimentService extends Disposable implements IGettingStartedExperimentService {
-    private readonly storageService;
-    private readonly telemetryService;
-    private readonly productService;
-    readonly _serviceBrand: undefined;
-    private readonly experiment;
-    constructor(storageService: IStorageService, telemetryService: ITelemetryService, productService: IProductService);
-    private getExperimentAllocation;
-    private getOrCreateExperiment;
-    private createNewExperiment;
-    private sendExperimentTelemetry;
-    getCurrentExperiment(): IGettingStartedExperiment | undefined;
-}

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.js

@@ -1,98 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
-import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-
-const EXPERIMENT_STORAGE_KEY = 'gettingStartedExperiment';
-var GettingStartedExperimentGroup;
-(function (GettingStartedExperimentGroup) {
-    GettingStartedExperimentGroup["New"] = "newExp";
-    GettingStartedExperimentGroup["Control"] = "controlExp";
-    GettingStartedExperimentGroup["Default"] = "defaultExp";
-})(GettingStartedExperimentGroup || (GettingStartedExperimentGroup = {}));
-const STABLE_EXPERIMENT_GROUPS = [
-    { name: GettingStartedExperimentGroup.New, min: 0.0, max: 0.2, iteration: 1, walkthroughId: 'NewWelcomeExperience' },
-    { name: GettingStartedExperimentGroup.Control, min: 0.2, max: 0.4, iteration: 1, walkthroughId: 'Setup' },
-    { name: GettingStartedExperimentGroup.Default, min: 0.4, max: 1, iteration: 1, walkthroughId: 'Setup' }
-];
-const INSIDERS_EXPERIMENT_GROUPS = [
-    { name: GettingStartedExperimentGroup.New, min: 0.0, max: 0.3, iteration: 1, walkthroughId: 'NewWelcomeExperience' },
-    { name: GettingStartedExperimentGroup.Control, min: 0.3, max: 0.6, iteration: 1, walkthroughId: 'Setup' },
-    { name: GettingStartedExperimentGroup.Default, min: 0.6, max: 1, iteration: 1, walkthroughId: 'Setup' }
-];
-let GettingStartedExperimentService = class GettingStartedExperimentService extends Disposable {
-    constructor(storageService, telemetryService, productService) {
-        super();
-        this.storageService = storageService;
-        this.telemetryService = telemetryService;
-        this.productService = productService;
-        this.experiment = this.getOrCreateExperiment();
-        this.sendExperimentTelemetry();
-    }
-    getExperimentAllocation() {
-        const quality = this.productService.quality;
-        if (quality === 'stable') {
-            return STABLE_EXPERIMENT_GROUPS;
-        }
-        else if (quality === 'insider') {
-            return INSIDERS_EXPERIMENT_GROUPS;
-        }
-        return;
-    }
-    getOrCreateExperiment() {
-        const storedExperiment = this.storageService.get(EXPERIMENT_STORAGE_KEY, StorageScope.APPLICATION);
-        if (storedExperiment) {
-            try {
-                return JSON.parse(storedExperiment);
-            }
-            catch (e) {
-                this.storageService.remove(EXPERIMENT_STORAGE_KEY, StorageScope.APPLICATION);
-            }
-        }
-        const newExperiment = this.createNewExperiment();
-        if (!newExperiment) {
-            return;
-        }
-        this.storageService.store(EXPERIMENT_STORAGE_KEY, JSON.stringify(newExperiment), StorageScope.APPLICATION, StorageTarget.MACHINE);
-        return newExperiment;
-    }
-    createNewExperiment() {
-        const cohort = Math.random();
-        const experimentGroups = this.getExperimentAllocation();
-        if (!experimentGroups) {
-            return;
-        }
-        for (const group of experimentGroups) {
-            if (cohort >= group.min && cohort < group.max) {
-                return { cohort, experimentGroup: group.name, walkthroughId: group.walkthroughId, iteration: group.iteration };
-            }
-        }
-        return;
-    }
-    sendExperimentTelemetry() {
-        if (!this.experiment) {
-            return;
-        }
-        this.telemetryService.publicLog2('gettingStarted.experimentCohort', {
-            cohort: this.experiment.cohort,
-            experimentGroup: this.experiment.experimentGroup,
-            iteration: this.experiment.iteration,
-            walkthroughId: this.experiment.walkthroughId
-        });
-    }
-    getCurrentExperiment() {
-        return this.experiment;
-    }
-};
-GettingStartedExperimentService = ( __decorate([
-    ( __param(0, IStorageService)),
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IProductService))
-], GettingStartedExperimentService));
-
-export { GettingStartedExperimentGroup, GettingStartedExperimentService };