@codingame/monaco-vscode-walkthrough-service-override 4.5.2 → 5.0.1

package/package.json

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

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js

@@ -11,7 +11,6 @@ import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/ed
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { hiddenEntriesConfigurationKey, walkthroughMetadataConfigurationKey } from './gettingStartedService.js';
 import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service';
 import { GettingStartedInput } from './gettingStartedInput.js';
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -28,8 +27,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { StartupPageEditorResolverContribution, StartupPageRunnerContribution } from './startupPage.js';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import './gettingStartedService._contribution.js';
 import './gettingStartedIcons.js';
 
 const _moduleId = "vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution";
@@ -44,6 +42,9 @@ registerAction2(class extends Action2 {
                 id: MenuId.MenubarHelpMenu,
                 group: '1_welcome',
                 order: 1,
+            },
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 1, 'Opens a Walkthrough to help you get started in VS Code.'))
             }
         });
     }
@@ -110,15 +111,15 @@ registerAction2(class extends Action2 {
     }
 });
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(GettingStartedInput.ID, GettingStartedInputSerializer);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localizeWithPath(_moduleId, 1, "Welcome"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localizeWithPath(_moduleId, 2, "Welcome"))), [
     ( (new SyncDescriptor(GettingStartedInput)))
 ]);
-const category = ( localize2WithPath(_moduleId, 1, "Welcome"));
+const category = ( localize2WithPath(_moduleId, 2, "Welcome"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.goBack',
-            title: ( localize2WithPath(_moduleId, 2, 'Go Back')),
+            title: ( localize2WithPath(_moduleId, 3, 'Go Back')),
             category,
             keybinding: {
                 weight: 100 ,
@@ -154,7 +155,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepComplete',
-            title: ( localizeWithPath(_moduleId, 3, "Mark Step Complete")),
+            title: ( localizeWithPath(_moduleId, 4, "Mark Step Complete")),
             category,
         });
     }
@@ -170,7 +171,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepIncomplete',
-            title: ( localizeWithPath(_moduleId, 4, "Mark Step Incomplete")),
+            title: ( localizeWithPath(_moduleId, 5, "Mark Step Incomplete")),
             category,
         });
     }
@@ -186,7 +187,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.showAllWalkthroughs',
-            title: ( localize2WithPath(_moduleId, 5, 'Open Walkthrough...')),
+            title: ( localize2WithPath(_moduleId, 6, 'Open Walkthrough...')),
             category,
             f1: true,
         });
@@ -214,7 +215,7 @@ registerAction2(class extends Action2 {
         quickPick.canSelectMany = false;
         quickPick.matchOnDescription = true;
         quickPick.matchOnDetail = true;
-        quickPick.placeholder = ( localizeWithPath(_moduleId, 6, 'Select a walkthrough to open'));
+        quickPick.placeholder = ( localizeWithPath(_moduleId, 7, 'Select a walkthrough to open'));
         quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
         quickPick.busy = true;
         quickPick.onDidAccept(() => {
@@ -235,7 +236,7 @@ registerAction2(class extends Action2 {
 });
 const WorkspacePlatform = ( (new RawContextKey('workspacePlatform', undefined, ( localizeWithPath(
     _moduleId,
-    7,
+    8,
     "The platform of the current workspace, which in remote or serverless contexts may be different from the platform of the UI"
 )))));
 let WorkspacePlatformContribution = class WorkspacePlatformContribution {
@@ -288,7 +289,7 @@ configurationRegistry.registerConfiguration({
             default: true,
             description: ( localizeWithPath(
                 _moduleId,
-                8,
+                9,
                 "When enabled, an extension's walkthrough will open upon install of the extension."
             ))
         },
@@ -297,29 +298,29 @@ configurationRegistry.registerConfiguration({
             'type': 'string',
             'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal'],
             'enumDescriptions': [
-                ( localizeWithPath(_moduleId, 9, "Start without an editor.")),
+                ( localizeWithPath(_moduleId, 10, "Start without an editor.")),
                 ( localizeWithPath(
                     _moduleId,
-                    10,
+                    11,
                     "Open the Welcome page, with content to aid in getting started with VS Code and extensions."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    11,
+                    12,
                     "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    12,
+                    13,
                     "Open a new untitled text file (only applies when opening an empty window)."
                 )),
-                ( localizeWithPath(_moduleId, 13, "Open the Welcome page when opening an empty workbench.")),
-                ( localizeWithPath(_moduleId, 14, "Open a new terminal in the editor area.")),
+                ( localizeWithPath(_moduleId, 14, "Open the Welcome page when opening an empty workbench.")),
+                ( localizeWithPath(_moduleId, 15, "Open a new terminal in the editor area.")),
             ],
             'default': 'welcomePage',
             'description': ( localizeWithPath(
                 _moduleId,
-                15,
+                16,
                 "Controls which editor is shown at startup, if none are restored from the previous session."
             ))
         },
@@ -327,42 +328,13 @@ configurationRegistry.registerConfiguration({
             scope: 1 ,
             type: 'boolean',
             default: false,
-            deprecationMessage: ( localizeWithPath(_moduleId, 16, "Deprecated, use the global `workbench.reduceMotion`.")),
-            description: ( localizeWithPath(_moduleId, 17, "When enabled, reduce motion in welcome page."))
+            deprecationMessage: ( localizeWithPath(_moduleId, 17, "Deprecated, use the global `workbench.reduceMotion`.")),
+            description: ( localizeWithPath(_moduleId, 18, "When enabled, reduce motion in welcome page."))
         }
     }
 });
 registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, 3 );
 registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, 2 );
 registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, 3 );
-registerAction2(class extends Action2 {
-    constructor() {
-        super({
-            id: 'resetGettingStartedProgress',
-            category: ( localize2WithPath(_moduleId, 18, "Developer")),
-            title: ( localize2WithPath(_moduleId, 19, "Reset Welcome Page Walkthrough Progress")),
-            f1: true
-        });
-    }
-    run(accessor) {
-        const gettingStartedService = accessor.get(IWalkthroughsService);
-        const storageService = accessor.get(IStorageService);
-        storageService.store(hiddenEntriesConfigurationKey, JSON.stringify([]), 0 , 0 );
-        storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([]), 0 , 0 );
-        const memento = ( (new Memento('gettingStartedService', accessor.get(IStorageService))));
-        const record = memento.getMemento(0 , 0 );
-        for (const key in record) {
-            if (Object.prototype.hasOwnProperty.call(record, key)) {
-                try {
-                    gettingStartedService.deprogressStep(key);
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }
-        }
-        memento.saveMemento();
-    }
-});
 
 export { WorkspacePlatform };

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

@@ -43,7 +43,6 @@ import { firstSessionDateStorageKey } from 'vscode/vscode/vs/platform/telemetry/
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { getTelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { defaultToggleStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { UNKNOWN_EMPTY_WINDOW_WORKSPACE } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { isRecentFolder, isRecentWorkspace } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
@@ -64,7 +63,7 @@ import { startEntries } from '../common/gettingStartedContent.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
-import { ThemeSettings } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { IWorkbenchThemeService } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { GettingStartedIndexList } from './gettingStartedList.js';
 import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 
@@ -97,6 +96,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
         this.languageService = languageService;
         this.fileService = fileService;
         this.openerService = openerService;
+        this.themeService = themeService;
         this.storageService = storageService;
         this.extensionService = extensionService;
         this.instantiationService = instantiationService;
@@ -565,13 +565,17 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             this.stepDisposables.add(layoutDelayer);
             this.stepDisposables.add({ dispose: () => this.layoutMarkdown = undefined });
             postTrueKeysMessage();
-            this.stepDisposables.add(this.webview.onMessage(e => {
+            this.stepDisposables.add(this.webview.onMessage(async (e) => {
                 const message = e.message;
                 if (message.startsWith('command:')) {
                     this.openerService.open(message, { allowCommands: true });
                 }
                 else if (message.startsWith('setTheme:')) {
-                    this.configurationService.updateValue(ThemeSettings.COLOR_THEME, message.slice('setTheme:'.length), 2 );
+                    const themeId = message.slice('setTheme:'.length);
+                    const theme = (await this.themeService.getColorThemes()).find(theme => theme.settingsId === themeId);
+                    if (theme) {
+                        this.themeService.setColorTheme(theme.id, 2 );
+                    }
                 }
                 else {
                     console.error('Unexpected message', message);
@@ -1383,7 +1387,7 @@ GettingStartedPage = GettingStartedPage_1 = ( (__decorate([
     ( (__param(7, ILanguageService))),
     ( (__param(8, IFileService))),
     ( (__param(9, IOpenerService))),
-    ( (__param(10, IThemeService))),
+    ( (__param(10, IWorkbenchThemeService))),
     ( (__param(11, IStorageService))),
     ( (__param(12, IExtensionService))),
     ( (__param(13, IInstantiationService))),

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService._contribution.js

@@ -0,0 +1,44 @@
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { hiddenEntriesConfigurationKey, walkthroughMetadataConfigurationKey } from './gettingStartedService.js';
+import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service';
+
+const _moduleId = "vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService";
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'resetGettingStartedProgress',
+            category: ( localize2WithPath(_moduleId, 1, "Developer")),
+            title: ( localize2WithPath(_moduleId, 2, "Reset Welcome Page Walkthrough Progress")),
+            f1: true,
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    3,
+                    'Reset the progress of all Walkthrough steps on the Welcome Page to make them appear as if they are being viewed for the first time, providing a fresh start to the getting started experience.'
+                )),
+            }
+        });
+    }
+    run(accessor) {
+        const gettingStartedService = accessor.get(IWalkthroughsService);
+        const storageService = accessor.get(IStorageService);
+        storageService.store(hiddenEntriesConfigurationKey, JSON.stringify([]), 0 , 0 );
+        storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([]), 0 , 0 );
+        const memento = ( (new Memento('gettingStartedService', accessor.get(IStorageService))));
+        const record = memento.getMemento(0 , 0 );
+        for (const key in record) {
+            if (Object.prototype.hasOwnProperty.call(record, key)) {
+                try {
+                    gettingStartedService.deprogressStep(key);
+                }
+                catch (e) {
+                    console.error(e);
+                }
+            }
+        }
+        memento.saveMemento();
+    }
+});

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.js

@@ -416,7 +416,7 @@ const walkthroughs = [
                         _moduleId,
                         59,
                         "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}",
-                        Button(( localizeWithPath(_moduleId, 60, "Browse Recommended Extensions")), 'command:workbench.extensions.action.showRecommendedExtensions')
+                        Button(( localizeWithPath(_moduleId, 60, "Browse Popular Extensions")), 'command:workbench.extensions.action.showPopularExtensions')
                     )),
                     when: 'workspacePlatform != \'webworker\'',
                     media: {

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.js

@@ -29,7 +29,14 @@ class EditorWalkThroughAction extends Action2 {
             id: EditorWalkThroughAction.ID,
             title: EditorWalkThroughAction.LABEL,
             category: Categories.Help,
-            f1: true
+            f1: true,
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    2,
+                    "Opens an interactive playground for learning about the editor."
+                ))
+            }
         });
     }
     run(serviceAccessor) {