@codingame/monaco-vscode-walkthrough-service-override 10.1.3 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-walkthrough-service-override",
-  "version": "10.1.3",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
     "marked": "~14.0.0"
   }
 }

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

@@ -37,7 +37,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.openWalkthrough',
-            title: ( localize2(3199, 'Welcome')),
+            title: ( localize2(2603, 'Welcome')),
             category: Categories.Help,
             f1: true,
             menu: {
@@ -46,7 +46,7 @@ registerAction2(class extends Action2 {
                 order: 1,
             },
             metadata: {
-                description: ( localize2(3200, 'Opens a Walkthrough to help you get started in VS Code.'))
+                description: ( localize2(2604, 'Opens a Walkthrough to help you get started in VS Code.'))
             }
         });
     }
@@ -124,15 +124,15 @@ registerAction2(class extends Action2 {
     }
 });
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(GettingStartedInput.ID, GettingStartedInputSerializer);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(3201, "Welcome"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(2605, "Welcome"))), [
     ( (new SyncDescriptor(GettingStartedInput)))
 ]);
-const category = ( localize2(3201, "Welcome"));
+const category = ( localize2(2605, "Welcome"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.goBack',
-            title: ( localize2(3202, 'Go Back')),
+            title: ( localize2(2606, 'Go Back')),
             category,
             keybinding: {
                 weight: 100 ,
@@ -168,7 +168,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepComplete',
-            title: ( localize(3203, "Mark Step Complete")),
+            title: ( localize(2607, "Mark Step Complete")),
             category,
         });
     }
@@ -184,7 +184,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepIncomplete',
-            title: ( localize(3204, "Mark Step Incomplete")),
+            title: ( localize(2608, "Mark Step Incomplete")),
             category,
         });
     }
@@ -200,7 +200,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.showAllWalkthroughs',
-            title: ( localize2(3205, 'Open Walkthrough...')),
+            title: ( localize2(2609, 'Open Walkthrough...')),
             category,
             f1: true,
         });
@@ -229,7 +229,7 @@ registerAction2(class extends Action2 {
         quickPick.canSelectMany = false;
         quickPick.matchOnDescription = true;
         quickPick.matchOnDetail = true;
-        quickPick.placeholder = ( localize(3206, 'Select a walkthrough to open'));
+        quickPick.placeholder = ( localize(2610, 'Select a walkthrough to open'));
         quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
         quickPick.busy = true;
         disposables.add(quickPick.onDidAccept(() => {
@@ -249,7 +249,7 @@ registerAction2(class extends Action2 {
     }
 });
 const WorkspacePlatform = ( (new RawContextKey('workspacePlatform', undefined, ( localize(
-    3207,
+    2611,
     "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 {
@@ -301,7 +301,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: true,
             description: ( localize(
-                3208,
+                2612,
                 "When enabled, an extension's walkthrough will open upon install of the extension."
             ))
         },
@@ -310,25 +310,25 @@ configurationRegistry.registerConfiguration({
             'type': 'string',
             'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal'],
             'enumDescriptions': [
-                ( localize(3209, "Start without an editor.")),
+                ( localize(2613, "Start without an editor.")),
                 ( localize(
-                    3210,
+                    2614,
                     "Open the Welcome page, with content to aid in getting started with VS Code and extensions."
                 )),
                 ( localize(
-                    3211,
+                    2615,
                     "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."
                 )),
                 ( localize(
-                    3212,
+                    2616,
                     "Open a new untitled text file (only applies when opening an empty window)."
                 )),
-                ( localize(3213, "Open the Welcome page when opening an empty workbench.")),
-                ( localize(3214, "Open a new terminal in the editor area.")),
+                ( localize(2617, "Open the Welcome page when opening an empty workbench.")),
+                ( localize(2618, "Open a new terminal in the editor area.")),
             ],
             'default': 'welcomePage',
             'description': ( localize(
-                3215,
+                2619,
                 "Controls which editor is shown at startup, if none are restored from the previous session."
             ))
         },
@@ -336,8 +336,8 @@ configurationRegistry.registerConfiguration({
             scope: 1 ,
             type: 'boolean',
             default: false,
-            deprecationMessage: ( localize(3216, "Deprecated, use the global `workbench.reduceMotion`.")),
-            description: ( localize(3217, "When enabled, reduce motion in welcome page."))
+            deprecationMessage: ( localize(2620, "Deprecated, use the global `workbench.reduceMotion`.")),
+            description: ( localize(2621, "When enabled, reduce motion in welcome page."))
         }
     }
 });

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

@@ -14,7 +14,7 @@ import { splitRecentLabel } from 'vscode/vscode/vs/base/common/labels';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { parse } from 'vscode/vscode/vs/base/common/marshalling';
 import { matchesScheme, Schemas } from 'vscode/vscode/vs/base/common/network';
-import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { isMacintosh, OS } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -42,7 +42,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { firstSessionDateStorageKey } from 'vscode/vscode/vs/platform/telemetry/common/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 { defaultToggleStyles, defaultButtonStyles, defaultKeybindingLabelStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 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';
@@ -66,6 +66,7 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { IWorkbenchThemeService } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { GettingStartedIndexList } from './gettingStartedList.js';
 import { AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
+import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
 
 var GettingStartedPage_1;
 const SLIDE_TRANSITION_TIME_MS = 250;
@@ -121,7 +122,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
         this.container = $('.gettingStartedContainer', {
             role: 'document',
             tabindex: 0,
-            'aria-label': ( localize(7565, "Overview of how to get up to speed with your editor."))
+            'aria-label': ( localize(7233, "Overview of how to get up to speed with your editor."))
         });
         this.stepMediaComponent = $('.getting-started-media');
         this.stepMediaComponent.id = generateUuid();
@@ -218,6 +219,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             if (!this.editorInput || !this.currentWalkthrough || !this.editorInput.selectedCategory || !this.editorInput.selectedStep) {
                 return;
             }
+            const editorPane = this.groupsService.activeGroup.activeEditorPane;
+            if (!(editorPane instanceof GettingStartedPage_1)) {
+                return;
+            }
             const restoreData = { folder: UNKNOWN_EMPTY_WINDOW_WORKSPACE.id, category: this.editorInput.selectedCategory, step: this.editorInput.selectedStep };
             this.storageService.store(restoreWalkthroughsConfigurationKey, JSON.stringify(restoreData), 0 , 1 );
         }));
@@ -399,7 +404,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             label: x.title,
             detail: x.description,
             description: x.source,
-        })))), { canPickMany: false, matchOnDescription: true, matchOnDetail: true, title: ( localize(7566, "Open Walkthrough...")) });
+        })))), { canPickMany: false, matchOnDescription: true, matchOnDetail: true, title: ( localize(7234, "Open Walkthrough...")) });
         if (selection) {
             this.runDispatchCommand('selectCategory', selection.id);
         }
@@ -584,8 +589,8 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
     provideScreenReaderUpdate() {
         if (this.configurationService.getValue("accessibility.verbosity.walkthrough" )) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
-            return kbLabel ? ( localize(7567, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
-                7568,
+            return kbLabel ? ( localize(7235, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
+                7236,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.\n"
             ));
         }
@@ -637,7 +642,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             this.categoriesPageScrollbar.dispose();
         }
         this.categoriesSlide = $('.gettingStartedSlideCategories.gettingStartedSlide');
-        const prevButton = $('button.prev-button.button-link', { 'x-dispatch': 'scrollPrev' }, $('span.scroll-button.codicon.codicon-chevron-left'), $('span.moreText', {}, ( localize(7569, "Go Back"))));
+        const prevButton = $('button.prev-button.button-link', { 'x-dispatch': 'scrollPrev' }, $('span.scroll-button.codicon.codicon-chevron-left'), $('span.moreText', {}, ( localize(7237, "Go Back"))));
         this.stepsSlide = $('.gettingStartedSlideDetails.gettingStartedSlide', {}, prevButton);
         this.stepsContent = $('.gettingStartedDetailsContent', {});
         this.detailsPageScrollbar = this._register(( (new DomScrollableElement(this.stepsContent, { className: 'full-height-scrollable' }))));
@@ -658,11 +663,11 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             icon: Codicon.check,
             actionClassName: 'getting-started-checkbox',
             isChecked: this.configurationService.getValue(configurationKey) === 'welcomePage',
-            title: ( localize(7570, "When checked, this page will be shown on startup.")),
+            title: ( localize(7238, "When checked, this page will be shown on startup.")),
             ...defaultToggleStyles
         })));
         showOnStartupCheckbox.domNode.id = 'showOnStartup';
-        const showOnStartupLabel = $('label.caption', { for: 'showOnStartup' }, ( localize(7571, "Show welcome page on startup")));
+        const showOnStartupLabel = $('label.caption', { for: 'showOnStartup' }, ( localize(7239, "Show welcome page on startup")));
         const onShowOnStartupChanged = () => {
             if (showOnStartupCheckbox.checked) {
                 this.telemetryService.publicLog2('gettingStarted.ActionExecuted', { command: 'showOnStartupChecked', argument: undefined, walkthroughId: this.currentWalkthrough?.id });
@@ -681,7 +686,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             showOnStartupCheckbox.checked = !showOnStartupCheckbox.checked;
             onShowOnStartupChanged();
         }));
-        const header = $('.header', {}, $('h1.product-name.caption', {}, this.productService.nameLong), $('p.subtitle.description', {}, ( localize(7572, "Editing evolved"))));
+        const header = $('.header', {}, $('h1.product-name.caption', {}, this.productService.nameLong), $('p.subtitle.description', {}, ( localize(7240, "Editing evolved"))));
         const leftColumn = $('.categories-column.categories-column-left', {});
         const rightColumn = $('.categories-column.categories-column-right', {});
         const startList = this.buildStartList();
@@ -750,6 +755,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                     this.hasScrolledToFirstCategory = true;
                     this.currentWalkthrough = first;
                     this.editorInput.selectedCategory = this.currentWalkthrough?.id;
+                    this.editorInput.walkthroughPageTitle = this.currentWalkthrough.walkthroughPageTitle;
                     this.buildCategorySlide(this.editorInput.selectedCategory, undefined);
                     this.setSlide('details', true );
                     return;
@@ -775,7 +781,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             const link = $('button.button-link');
             link.innerText = name;
             link.title = fullPath;
-            link.setAttribute('aria-label', ( localize(7573, "Open folder {0} with path {1}", name, parentPath)));
+            link.setAttribute('aria-label', ( localize(7241, "Open folder {0} with path {1}", name, parentPath)));
             link.addEventListener('click', e => {
                 this.telemetryService.publicLog2('gettingStarted.ActionExecuted', { command: 'openRecent', argument: undefined, walkthroughId: this.currentWalkthrough?.id });
                 this.hostService.openWindow([windowOpenable], {
@@ -798,18 +804,18 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             this.recentlyOpenedList.dispose();
         }
         const recentlyOpenedList = this.recentlyOpenedList = ( (new GettingStartedIndexList({
-            title: ( localize(7574, "Recent")),
+            title: ( localize(7242, "Recent")),
             klass: 'recently-opened',
             limit: 5,
-            empty: $('.empty-recent', {}, ( localize(7575, "You have no recent folders,")), $('button.button-link', { 'x-dispatch': 'openFolder' }, ( localize(7576, "open a folder"))), ( localize(7577, "to start."))),
+            empty: $('.empty-recent', {}, ( localize(7243, "You have no recent folders,")), $('button.button-link', { 'x-dispatch': 'openFolder' }, ( localize(7244, "open a folder"))), ( localize(7245, "to start."))),
             more: $('.more', {}, $('button.button-link', {
                 'x-dispatch': 'showMoreRecents',
                 title: ( localize(
-                    7578,
+                    7246,
                     "Show All Recent Folders {0}",
                     this.getKeybindingLabel(OpenRecentAction.ID)
                 ))
-            }, ( localize(7579, "More...")))),
+            }, ( localize(7247, "More...")))),
             renderElement: renderRecent,
             contextService: this.contextService
         })));
@@ -837,7 +843,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             this.startList.dispose();
         }
         const startList = this.startList = ( (new GettingStartedIndexList({
-            title: ( localize(7580, "Start")),
+            title: ( localize(7248, "Start")),
             klass: 'start-container',
             limit: 10,
             renderElement: renderStartEntry,
@@ -853,10 +859,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             const renderNewBadge = (category.newItems || category.newEntry) && !category.isFeatured;
             const newBadge = $('.new-badge', {});
             if (category.newEntry) {
-                reset(newBadge, $('.new-category', {}, ( localize(7581, "New"))));
+                reset(newBadge, $('.new-category', {}, ( localize(7249, "New"))));
             }
             else if (category.newItems) {
-                reset(newBadge, $('.new-items', {}, ( localize(7582, "Updated"))));
+                reset(newBadge, $('.new-items', {}, ( localize(7250, "Updated"))));
             }
             const featuredBadge = $('.featured-badge', {});
             const descriptionContent = $('.description-content', {});
@@ -872,9 +878,9 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             }, featuredBadge, $('.main-content', {}, this.iconWidgetFor(category), titleContent, renderNewBadge ? newBadge : $('.no-badge'), $('a.codicon.codicon-close.hide-category-button', {
                 'tabindex': 0,
                 'x-dispatch': 'hideCategory:' + category.id,
-                'title': ( localize(7583, "Hide")),
+                'title': ( localize(7251, "Hide")),
                 'role': 'button',
-                'aria-label': ( localize(7584, "Hide")),
+                'aria-label': ( localize(7252, "Hide")),
             })), descriptionContent, $('.category-progress', { 'x-data-category-id': category.id, }, $('.progress-bar-outer', { 'role': 'progressbar' }, $('.progress-bar-inner'))));
         };
         if (this.gettingStartedList) {
@@ -900,10 +906,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             return rank;
         };
         const gettingStartedList = this.gettingStartedList = ( (new GettingStartedIndexList({
-            title: ( localize(7585, "Walkthroughs")),
+            title: ( localize(7253, "Walkthroughs")),
             klass: 'getting-started',
             limit: 5,
-            footer: $('span.button-link.see-all-walkthroughs', { 'x-dispatch': 'seeAllWalkthroughs', 'tabindex': 0 }, ( localize(7579, "More..."))),
+            footer: $('span.button-link.see-all-walkthroughs', { 'x-dispatch': 'seeAllWalkthroughs', 'tabindex': 0 }, ( localize(7247, "More..."))),
             renderElement: renderGetttingStaredWalkthrough,
             rankElement: rankWalkthrough,
             contextService: this.contextService,
@@ -956,10 +962,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             bar.style.width = `${progress}%`;
             element.parentElement.classList.toggle('no-progress', stats.stepsComplete === 0);
             if (stats.stepsTotal === stats.stepsComplete) {
-                bar.title = ( localize(7586, "All {0} steps complete!", stats.stepsComplete));
+                bar.title = ( localize(7254, "All {0} steps complete!", stats.stepsComplete));
             }
             else {
-                bar.title = ( localize(7587, "{0} of {1} steps complete", stats.stepsComplete, stats.stepsTotal));
+                bar.title = ( localize(7255, "{0} of {1} steps complete", stats.stepsComplete, stats.stepsTotal));
             }
         });
     }
@@ -975,6 +981,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             reset(this.stepsContent);
             this.editorInput.selectedCategory = categoryID;
             this.editorInput.selectedStep = stepId;
+            this.editorInput.walkthroughPageTitle = ourCategory.walkthroughPageTitle;
             this.currentWalkthrough = ourCategory;
             this.buildCategorySlide(categoryID, stepId);
             this.setSlide('details');
@@ -1079,9 +1086,12 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                     this.runStepCommand(node.href);
                 }, null, this.detailsPageDisposables);
                 if (isCommand) {
-                    const keybindingLabel = this.getKeybindingLabel(command);
-                    if (keybindingLabel) {
-                        container.appendChild($('span.shortcut-message', {}, ( localize(7588, 'Tip: Use keyboard shortcut ')), $('span.keybinding', {}, keybindingLabel)));
+                    const keybinding = this.getKeyBinding(command);
+                    if (keybinding) {
+                        const shortcutMessage = $('span.shortcut-message', {}, ( localize(7256, 'Tip: Use keyboard shortcut ')));
+                        container.appendChild(shortcutMessage);
+                        const label = ( (new KeybindingLabel(shortcutMessage, OS, { ...defaultKeybindingLabelStyles })));
+                        label.set(keybinding);
                     }
                 }
                 this.detailsPageDisposables.add(button);
@@ -1171,7 +1181,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                 reset(stepTitle, ...renderLabelWithIcons(step.title));
                 const stepDescription = $('.step-container', {}, stepTitle, container);
                 if (step.media.type === 'image') {
-                    stepDescription.appendChild($('.image-description', { 'aria-label': ( localize(7589, "Image showing {0}", step.media.altText)) }));
+                    stepDescription.appendChild($('.image-description', { 'aria-label': ( localize(7257, "Image showing {0}", step.media.altText)) }));
                 }
                 return $('button.getting-started-step', {
                     'x-dispatch': 'selectTask:' + step.id,
@@ -1191,8 +1201,8 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             }
         }));
         const showNextCategory = this.gettingStartedCategories.find(_category => _category.id === category.next);
-        const stepsContainer = $('.getting-started-detail-container', { 'role': 'list' }, stepListContainer, $('.done-next-container', {}, $('button.button-link.all-done', { 'x-dispatch': 'allDone' }, $('span.codicon.codicon-check-all'), ( localize(7590, "Mark Done"))), ...(showNextCategory
-            ? [$('button.button-link.next', { 'x-dispatch': 'nextSection' }, ( localize(7591, "Next Section")), $('span.codicon.codicon-arrow-right'))]
+        const stepsContainer = $('.getting-started-detail-container', { 'role': 'list' }, stepListContainer, $('.done-next-container', {}, $('button.button-link.all-done', { 'x-dispatch': 'allDone' }, $('span.codicon.codicon-check-all'), ( localize(7258, "Mark Done"))), ...(showNextCategory
+            ? [$('button.button-link.next', { 'x-dispatch': 'nextSection' }, ( localize(7259, "Next Section")), $('span.codicon.codicon-arrow-right'))]
             : [])));
         this.detailsScrollbar = this._register(( (new DomScrollableElement(stepsContainer, { className: 'steps-container' }))));
         const stepListComponent = this.detailsScrollbar.getDomNode();
@@ -1209,12 +1219,12 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
     }
     buildTelemetryFooter(parent) {
         const mdRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
-        const privacyStatementCopy = ( localize(7592, "privacy statement"));
+        const privacyStatementCopy = ( localize(7260, "privacy statement"));
         const privacyStatementButton = `[${privacyStatementCopy}](command:workbench.action.openPrivacyStatementUrl)`;
-        const optOutCopy = ( localize(7593, "opt out"));
+        const optOutCopy = ( localize(7261, "opt out"));
         const optOutButton = `[${optOutCopy}](command:settings.filterByTelemetry)`;
         const text = ( localize(
-            7594,
+            7262,
             "{0} collects usage data. Read our {1} and learn how to {2}.",
             this.productService.nameShort,
             privacyStatementButton,
@@ -1233,6 +1243,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             return `(${label})`;
         }
     }
+    getKeyBinding(command) {
+        command = command.replace(/^command:/, '');
+        return this.keybindingService.lookupKeybinding(command);
+    }
     async scrollPrev() {
         this.inProgressScroll = this.inProgressScroll.then(async () => {
             if (this.prevWalkthrough && this.prevWalkthrough !== this.currentWalkthrough) {
@@ -1245,6 +1259,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                 this.editorInput.selectedCategory = undefined;
                 this.editorInput.selectedStep = undefined;
                 this.editorInput.showTelemetryNotice = false;
+                this.editorInput.walkthroughPageTitle = undefined;
                 if (this.gettingStartedCategories.length !== this.gettingStartedList?.itemCount) {
                     this.buildCategoriesSlide();
                 }
@@ -1281,7 +1296,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             const prevButton = this.container.querySelector('.prev-button.button-link');
             prevButton.style.display = this.editorInput.showWelcome || this.prevWalkthrough ? 'block' : 'none';
             const moreTextElement = prevButton.querySelector('.moreText');
-            moreTextElement.textContent = firstLaunch ? ( localize(7595, "Welcome")) : ( localize(7569, "Go Back"));
+            moreTextElement.textContent = firstLaunch ? ( localize(7263, "Welcome")) : ( localize(7237, "Go Back"));
             this.container.querySelector('.gettingStartedSlideDetails').querySelectorAll('button').forEach(button => button.disabled = false);
             this.container.querySelector('.gettingStartedSlideCategories').querySelectorAll('button').forEach(button => button.disabled = true);
             this.container.querySelector('.gettingStartedSlideCategories').querySelectorAll('input').forEach(button => button.disabled = true);
@@ -1332,16 +1347,18 @@ class GettingStartedInputSerializer {
         return JSON.stringify({ selectedCategory: editorInput.selectedCategory, selectedStep: editorInput.selectedStep });
     }
     deserialize(instantiationService, serializedEditorInput) {
-        try {
-            const { selectedCategory, selectedStep } = JSON.parse(serializedEditorInput);
+        return instantiationService.invokeFunction(accessor => {
+            try {
+                const { selectedCategory, selectedStep } = JSON.parse(serializedEditorInput);
+                return (
+                     (new GettingStartedInput({ selectedCategory, selectedStep }))
+                );
+            }
+            catch { }
             return (
-                 (new GettingStartedInput({ selectedCategory, selectedStep }))
+                 (new GettingStartedInput({}))
             );
-        }
-        catch { }
-        return (
-             (new GettingStartedInput({}))
-        );
+        });
     }
 }
 

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

@@ -64,15 +64,15 @@ class GettingStartedAccessibleProvider extends Disposable {
     }
     _getContent(index, waltkrough, step) {
         const stepsContent = ( localize(
-            7601,
+            7270,
             'Step {0}: {1}\nDescription: {2}',
             index,
             step.title,
             step.description.join(' ')
         ));
         return [
-            ( localize(7602, 'Title: {0}', waltkrough.title)),
-            ( localize(7603, 'Description: {0}', waltkrough.description)),
+            ( localize(7271, 'Title: {0}', waltkrough.title)),
+            ( localize(7272, 'Description: {0}', waltkrough.description)),
             stepsContent
         ].join('\n\n');
     }

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

@@ -11,10 +11,10 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { localize } from 'vscode/vscode/vs/nls';
 
-registerColor('welcomePage.background', null, ( localize(10755, 'Background color for the Welcome page.')));
-registerColor('welcomePage.tileBackground', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: '#000', hcLight: editorWidgetBackground }, ( localize(10756, 'Background color for the tiles on the Welcome page.')));
-registerColor('welcomePage.tileHoverBackground', { dark: ( (lighten(editorWidgetBackground, .2))), light: ( (darken(editorWidgetBackground, .1))), hcDark: null, hcLight: null }, ( localize(10757, 'Hover background color for the tiles on the Welcome.')));
-registerColor('welcomePage.tileBorder', { dark: '#ffffff1a', light: '#0000001a', hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10758, 'Border color for the tiles on the Welcome page.')));
-registerColor('welcomePage.progress.background', inputBackground, ( localize(10759, 'Foreground color for the Welcome page progress bars.')));
-registerColor('welcomePage.progress.foreground', textLinkForeground, ( localize(10760, 'Background color for the Welcome page progress bars.')));
-registerColor('walkthrough.stepTitle.foreground', { light: '#000000', dark: '#ffffff', hcDark: null, hcLight: null }, ( localize(10761, 'Foreground color of the heading of each walkthrough step')));
+registerColor('welcomePage.background', null, ( localize(10757, 'Background color for the Welcome page.')));
+registerColor('welcomePage.tileBackground', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: '#000', hcLight: editorWidgetBackground }, ( localize(10758, 'Background color for the tiles on the Welcome page.')));
+registerColor('welcomePage.tileHoverBackground', { dark: ( (lighten(editorWidgetBackground, .2))), light: ( (darken(editorWidgetBackground, .1))), hcDark: null, hcLight: null }, ( localize(10759, 'Hover background color for the tiles on the Welcome.')));
+registerColor('welcomePage.tileBorder', { dark: '#ffffff1a', light: '#0000001a', hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10760, 'Border color for the tiles on the Welcome page.')));
+registerColor('welcomePage.progress.background', inputBackground, ( localize(10761, 'Foreground color for the Welcome page progress bars.')));
+registerColor('welcomePage.progress.foreground', textLinkForeground, ( localize(10762, 'Background color for the Welcome page progress bars.')));
+registerColor('walkthrough.stepTitle.foreground', { light: '#000000', dark: '#ffffff', hcDark: null, hcLight: null }, ( localize(10763, 'Foreground color of the heading of each walkthrough step')));