@codingame/monaco-vscode-walkthrough-service-override 5.2.0 → 6.0.0

package/package.json

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

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

@@ -9,19 +9,21 @@ import { ContextKeyExpr, RawContextKey } from 'vscode/vscode/vs/platform/context
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 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';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { isMacintosh, isLinux, isWindows } from 'vscode/vscode/vs/base/common/platform';
+import { OperatingSystem, isMacintosh, isLinux, isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { StartupPageEditorResolverContribution, StartupPageRunnerContribution } from './startupPage.js';
@@ -94,9 +96,10 @@ registerAction2(class extends Action2 {
                     }]);
             }
             else {
+                const options = { selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false };
                 editorService.openEditor({
                     resource: GettingStartedInput.RESOURCE,
-                    options: { selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false }
+                    options
                 }, toSide ? SIDE_GROUP : undefined).then((editor) => {
                     editor?.makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
                 });
@@ -122,8 +125,8 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(_moduleId, 3, 'Go Back')),
             category,
             keybinding: {
-                weight: 100 ,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape,
                 when: inWelcomeContext
             },
             precondition: ( (ContextKeyExpr.equals('activeEditor', 'gettingStartedPage'))),
@@ -247,9 +250,9 @@ let WorkspacePlatformContribution = class WorkspacePlatformContribution {
         this.contextService = contextService;
         this.remoteAgentService.getEnvironment().then(env => {
             const remoteOS = env?.os;
-            const remotePlatform = remoteOS === 2  ? 'mac'
-                : remoteOS === 1  ? 'windows'
-                    : remoteOS === 3  ? 'linux'
+            const remotePlatform = remoteOS === OperatingSystem.Macintosh ? 'mac'
+                : remoteOS === OperatingSystem.Windows ? 'windows'
+                    : remoteOS === OperatingSystem.Linux ? 'linux'
                         : undefined;
             if (remotePlatform) {
                 WorkspacePlatform.bindTo(this.contextService).set(remotePlatform);
@@ -284,7 +287,7 @@ configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         'workbench.welcomePage.walkthroughs.openOnInstall': {
-            scope: 2 ,
+            scope: ConfigurationScope.MACHINE,
             type: 'boolean',
             default: true,
             description: ( localizeWithPath(
@@ -294,7 +297,7 @@ configurationRegistry.registerConfiguration({
             ))
         },
         'workbench.startupEditor': {
-            'scope': 4 ,
+            'scope': ConfigurationScope.RESOURCE,
             'type': 'string',
             'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal'],
             'enumDescriptions': [
@@ -325,7 +328,7 @@ configurationRegistry.registerConfiguration({
             ))
         },
         'workbench.welcomePage.preferReducedMotion': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
             deprecationMessage: ( localizeWithPath(_moduleId, 17, "Deprecated, use the global `workbench.reduceMotion`.")),
@@ -333,8 +336,8 @@ configurationRegistry.registerConfiguration({
         }
     }
 });
-registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, 3 );
-registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, 2 );
-registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, 3 );
+registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, WorkbenchPhase.AfterRestored);
 
 export { WorkspacePlatform };

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

@@ -6,10 +6,11 @@ import { Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
-import { equals, flatten, coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { equals, coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { Throttler, Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 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';
@@ -25,21 +26,23 @@ import { MarkdownRenderer } from 'vscode/vscode/vs/editor/browser/widget/markdow
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { Verbosity } from 'vscode/vscode/vs/platform/label/common/label';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { WillSaveStateReason, StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { firstSessionDateStorageKey } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { firstSessionDateStorageKey, TelemetryLevel } 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';
@@ -60,6 +63,7 @@ import { hiddenEntriesConfigurationKey, parseDescription } from './gettingStarte
 import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service';
 import { restoreWalkthroughsConfigurationKey } from './startupPage.js';
 import { startEntries } from '../common/gettingStartedContent.js';
+import { GroupDirection, GroupsOrder } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 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';
@@ -221,7 +225,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                 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 );
+            this.storageService.store(restoreWalkthroughsConfigurationKey, JSON.stringify(restoreData), StorageScope.PROFILE, StorageTarget.MACHINE);
         }));
     }
     shouldAnimate() {
@@ -272,8 +276,8 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                     const keyboardEvent = ( (new StandardKeyboardEvent(e)));
                     e.stopPropagation();
                     switch (keyboardEvent.keyCode) {
-                        case 3 :
-                        case 10 :
+                        case KeyCode.Enter:
+                        case KeyCode.Space:
                             this.runDispatchCommand(command, argument);
                             return;
                     }
@@ -416,12 +420,12 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
     getHiddenCategories() {
         return (
              (new Set(
-                JSON.parse(this.storageService.get(hiddenEntriesConfigurationKey, 0 , '[]'))
+                JSON.parse(this.storageService.get(hiddenEntriesConfigurationKey, StorageScope.PROFILE, '[]'))
             ))
         );
     }
     setHiddenCategories(hidden) {
-        this.storageService.store(hiddenEntriesConfigurationKey, JSON.stringify(hidden), 0 , 0 );
+        this.storageService.store(hiddenEntriesConfigurationKey, JSON.stringify(hidden), StorageScope.PROFILE, StorageTarget.USER);
     }
     async buildMediaComponent(stepId, forceRebuild = false) {
         if (!this.currentWalkthrough) {
@@ -463,9 +467,9 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             mediaElement.setAttribute('alt', media.altText);
             this.updateMediaSourceForColorMode(mediaElement, media.path);
             this.stepDisposables.add(addDisposableListener(this.stepMediaComponent, 'click', () => {
-                const hrefs = flatten(( (stepToExpand.description.map(
+                const hrefs = ( (stepToExpand.description.map(
                     lt => ( (lt.nodes.filter((node) => typeof node !== 'string').map(node => node.href)))
-                ))));
+                ))).flat();
                 if (hrefs.length === 1) {
                     const href = hrefs[0];
                     if (href.startsWith('http')) {
@@ -490,9 +494,9 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                 }
             }));
             this.stepDisposables.add(addDisposableListener(this.stepMediaComponent, 'click', () => {
-                const hrefs = flatten(( (stepToExpand.description.map(
+                const hrefs = ( (stepToExpand.description.map(
                     lt => ( (lt.nodes.filter((node) => typeof node !== 'string').map(node => node.href)))
-                ))));
+                ))).flat();
                 if (hrefs.length === 1) {
                     const href = hrefs[0];
                     if (href.startsWith('http')) {
@@ -526,9 +530,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             };
             if (serializedContextKeyExprs) {
                 const contextKeyExprs = coalesce(( (serializedContextKeyExprs.map(expr => ContextKeyExpr.deserialize(expr)))));
-                const watchingKeys = ( (new Set(
-                    flatten(( (contextKeyExprs.map(expr => ( (expr.keys()))))))
-                )));
+                const watchingKeys = ( (new Set(contextKeyExprs.flatMap(expr => ( (expr.keys()))))));
                 this.stepDisposables.add(this.contextService.onDidChangeContext(e => {
                     if (e.affectsSome(watchingKeys)) {
                         postTrueKeysMessage();
@@ -574,7 +576,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                     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 );
+                        this.themeService.setColorTheme(theme.id, ConfigurationTarget.USER);
                     }
                 }
                 else {
@@ -772,7 +774,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             footer.appendChild(telemetryNotice);
         }
         else if (!this.productService.openToWelcomeMainPage && !someStepsComplete && !this.hasScrolledToFirstCategory && this.showFeaturedWalkthrough) {
-            const firstSessionDateString = this.storageService.get(firstSessionDateStorageKey, -1 ) || ( (new Date())).toUTCString();
+            const firstSessionDateString = this.storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION) || ( (new Date())).toUTCString();
             const daysSinceFirstSession = ((+( (new Date()))) - (+( (new Date(firstSessionDateString))))) / 1000 / 60 / 60 / 24;
             const fistContentBehaviour = daysSinceFirstSession < 1 ? 'openToFirstCategory' : 'index';
             if (fistContentBehaviour === 'openToFirstCategory') {
@@ -795,10 +797,10 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             let windowOpenable;
             if (isRecentFolder(recent)) {
                 windowOpenable = { folderUri: recent.folderUri };
-                fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.folderUri, { verbose: 2  });
+                fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.folderUri, { verbose: Verbosity.LONG });
             }
             else {
-                fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: 2  });
+                fullPath = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: Verbosity.LONG });
                 windowOpenable = { workspaceUri: recent.workspace.configPath };
             }
             const { name, parentPath } = splitRecentLabel(fullPath);
@@ -1078,13 +1080,13 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
             return;
         }
         if (this.groupsService.count === 1) {
-            const sideGroup = this.groupsService.addGroup(this.groupsService.groups[0], 3 );
+            const sideGroup = this.groupsService.addGroup(this.groupsService.groups[0], GroupDirection.RIGHT);
             this.groupsService.activateGroup(sideGroup);
             const gettingStartedSize = Math.floor(fullSize.width / 2);
-            const gettingStartedGroup = this.groupsService.getGroups(1 ).find(group => (group.activeEditor instanceof GettingStartedInput));
+            const gettingStartedGroup = this.groupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => (group.activeEditor instanceof GettingStartedInput));
             this.groupsService.setSize(assertIsDefined(gettingStartedGroup), { width: gettingStartedSize, height: fullSize.height });
         }
-        const nonGettingStartedGroup = this.groupsService.getGroups(1 ).find(group => !(group.activeEditor instanceof GettingStartedInput));
+        const nonGettingStartedGroup = this.groupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => !(group.activeEditor instanceof GettingStartedInput));
         if (nonGettingStartedGroup) {
             this.groupsService.activateGroup(nonGettingStartedGroup);
             nonGettingStartedGroup.focus();
@@ -1122,7 +1124,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                     selectedStepIndex > -1 &&
                     this.currentWalkthrough?.steps.slice(selectedStepIndex + 1).some(step => !step.done)) {
                     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 );
+                    this.storageService.store(restoreWalkthroughsConfigurationKey, JSON.stringify(restoreData), StorageScope.PROFILE, StorageTarget.MACHINE);
                 }
             }
             this.commandService.executeCommand(commandURI.path, ...args).then(result => {
@@ -1133,7 +1135,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
                         return;
                     }
                     const restoreData = { folder: ( (toOpen.toString())), category: this.editorInput.selectedCategory, step: this.editorInput.selectedStep };
-                    this.storageService.store(restoreWalkthroughsConfigurationKey, JSON.stringify(restoreData), 0 , 1 );
+                    this.storageService.store(restoreWalkthroughsConfigurationKey, JSON.stringify(restoreData), StorageScope.PROFILE, StorageTarget.MACHINE);
                     this.hostService.openWindow([{ folderUri: toOpen }]);
                 }
             });
@@ -1220,13 +1222,13 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
         this.detailsPageDisposables.add(addDisposableListener(stepListContainer, 'keydown', (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
             const currentStepIndex = () => category.steps.findIndex(e => e.id === this.editorInput.selectedStep);
-            if (event.keyCode === 16 ) {
+            if (event.keyCode === KeyCode.UpArrow) {
                 const toExpand = category.steps.filter((step, index) => index < currentStepIndex() && this.contextService.contextMatchesRules(step.when));
                 if (toExpand.length) {
                     this.selectStep(toExpand[toExpand.length - 1].id, false);
                 }
             }
-            if (event.keyCode === 18 ) {
+            if (event.keyCode === KeyCode.DownArrow) {
                 const toExpand = category.steps.find((step, index) => index > currentStepIndex() && this.contextService.contextMatchesRules(step.when));
                 if (toExpand) {
                     this.selectStep(toExpand.id, false);
@@ -1284,7 +1286,7 @@ let GettingStartedPage = class GettingStartedPage extends EditorPane {
         this.detailsScrollbar = this._register(( (new DomScrollableElement(stepsContainer, { className: 'steps-container' }))));
         const stepListComponent = this.detailsScrollbar.getDomNode();
         const categoryFooter = $('.getting-started-footer');
-        if (this.editorInput.showTelemetryNotice && getTelemetryLevel(this.configurationService) !== 0  && this.productService.enableTelemetry) {
+        if (this.editorInput.showTelemetryNotice && getTelemetryLevel(this.configurationService) !== TelemetryLevel.NONE && this.productService.enableTelemetry) {
             this.buildTelemetryFooter(categoryFooter);
         }
         reset(this.stepsContent, categoryDescriptorComponent, stepListComponent, this.stepMediaComponent, categoryFooter);

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

@@ -1,5 +1,6 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 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';
@@ -25,10 +26,10 @@ registerAction2(class extends Action2 {
     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 );
+        storageService.store(hiddenEntriesConfigurationKey, JSON.stringify([]), StorageScope.PROFILE, StorageTarget.USER);
+        storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([]), StorageScope.PROFILE, StorageTarget.USER);
         const memento = ( (new Memento('gettingStartedService', accessor.get(IStorageService))));
-        const record = memento.getMemento(0 , 0 );
+        const record = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         for (const key in record) {
             if (Object.prototype.hasOwnProperty.call(record, key)) {
                 try {

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -19,8 +20,9 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
 import { walkthroughsExtensionPoint } from './gettingStartedExtensionPoint.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { dirname } from 'vscode/vscode/vs/base/common/path';
-import { coalesce, flatten } from 'vscode/vscode/vs/base/common/arrays';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -68,10 +70,10 @@ let WalkthroughsService = class WalkthroughsService extends Disposable {
         this.stepCompletionContextKeyExpressions = ( (new Set()));
         this.stepCompletionContextKeys = ( (new Set()));
         this.metadata = ( (new Map(
-            JSON.parse(this.storageService.get(walkthroughMetadataConfigurationKey, 0 , '[]'))
+            JSON.parse(this.storageService.get(walkthroughMetadataConfigurationKey, StorageScope.PROFILE, '[]'))
         )));
         this.memento = ( (new Memento('gettingStartedService', this.storageService)));
-        this.stepProgress = this.memento.getMemento(0 , 0 );
+        this.stepProgress = this.memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         this.initCompletionEventListeners();
         HasMultipleNewFileEntries.bindTo(this.contextService).set(false);
         this.registerWalkthroughs();
@@ -164,7 +166,7 @@ let WalkthroughsService = class WalkthroughsService extends Disposable {
         if (prior && walkthrough) {
             this.metadata.set(id, { ...prior, manaullyOpened: true, stepIDs: ( (walkthrough.steps.map(s => s.id))) });
         }
-        this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), 0 , 0 );
+        this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), StorageScope.PROFILE, StorageTarget.USER);
     }
     async registerExtensionWalkthroughContributions(extension) {
         const convertExtensionPathToFileURI = (path) => path.startsWith('https://')
@@ -280,7 +282,7 @@ let WalkthroughsService = class WalkthroughsService extends Disposable {
             this._registerWalkthrough(walkthoughDescriptor);
             this._onDidAddWalkthrough.fire(this.resolveWalkthrough(walkthoughDescriptor));
         }));
-        this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), 0 , 0 );
+        this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), StorageScope.PROFILE, StorageTarget.USER);
         if (sectionToOpen && this.configurationService.getValue('workbench.welcomePage.walkthroughs.openOnInstall')) {
             this.telemetryService.publicLog2('gettingStarted.didAutoOpenWalkthrough', { id: sectionToOpen });
             this.commandService.executeCommand('workbench.action.openWalkthrough', sectionToOpen, true);
@@ -410,9 +412,9 @@ let WalkthroughsService = class WalkthroughsService extends Disposable {
             return;
         }
         if (!step.completionEvents.length) {
-            step.completionEvents = coalesce(flatten(( (step.description
+            step.completionEvents = coalesce(step.description
                 .filter(linkedText => linkedText.nodes.length === 1)
-                .map(linkedText => ( (linkedText.nodes
+                .flatMap(linkedText => ( (linkedText.nodes
                 .filter(((node) => typeof node !== 'string'))
                 .map(({ href }) => {
                 if (href.startsWith('command:')) {
@@ -422,7 +424,7 @@ let WalkthroughsService = class WalkthroughsService extends Disposable {
                     return 'onLink:' + href;
                 }
                 return undefined;
-            }))))))));
+            })))));
         }
         if (!step.completionEvents.length) {
             step.completionEvents.push('stepSelected');

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

@@ -4,24 +4,28 @@ import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
-import { UNKNOWN_EMPTY_WINDOW_WORKSPACE } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { UNKNOWN_EMPTY_WINDOW_WORKSPACE, WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
+import { LifecyclePhase, StartupKind } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { GettingStartedInput, gettingStartedInputTypeId } from './gettingStartedInput.js';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { getTelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
+import { TelemetryLevel } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
+import { TerminalCommandId } from 'vscode/vscode/vs/workbench/contrib/terminal/common/terminal';
 
 const _moduleId = "vs/workbench/contrib/welcomeGettingStarted/browser/startupPage";
 const restoreWalkthroughsConfigurationKey = 'workbench.welcomePage.restorableWalkthroughs';
@@ -75,13 +79,13 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
         this.run().then(undefined, onUnexpectedError);
     }
     async run() {
-        await this.lifecycleService.when(3 );
+        await this.lifecycleService.when(LifecyclePhase.Restored);
         if (this.productService.enableTelemetry
             && this.productService.showTelemetryOptOut
-            && getTelemetryLevel(this.configurationService) !== 0
+            && getTelemetryLevel(this.configurationService) !== TelemetryLevel.NONE
             && !this.environmentService.skipWelcome
-            && !this.storageService.get(telemetryOptOutStorageKey, 0 )) {
-            this.storageService.store(telemetryOptOutStorageKey, true, 0 , 0 );
+            && !this.storageService.get(telemetryOptOutStorageKey, StorageScope.PROFILE)) {
+            this.storageService.store(telemetryOptOutStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
             await this.openGettingStarted(true);
             return;
         }
@@ -89,7 +93,7 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
             return;
         }
         const enabled = isStartupPageEnabled(this.configurationService, this.contextService, this.environmentService);
-        if (enabled && this.lifecycleService.startupKind !== 3 ) {
+        if (enabled && this.lifecycleService.startupKind !== StartupKind.ReloadedWindow) {
             const hasBackups = await this.workingCopyBackupService.hasBackups();
             if (hasBackups) {
                 return;
@@ -110,13 +114,13 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
                     await this.openGettingStarted();
                 }
                 else if (startupEditorSetting.value === 'terminal') {
-                    this.commandService.executeCommand("workbench.action.createTerminalEditor" );
+                    this.commandService.executeCommand(TerminalCommandId.CreateTerminalEditor);
                 }
             }
         }
     }
     tryOpenWalkthroughForFolder() {
-        const toRestore = this.storageService.get(restoreWalkthroughsConfigurationKey, 0 );
+        const toRestore = this.storageService.get(restoreWalkthroughsConfigurationKey, StorageScope.PROFILE);
         if (!toRestore) {
             return false;
         }
@@ -124,11 +128,12 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
             const restoreData = JSON.parse(toRestore);
             const currentWorkspace = this.contextService.getWorkspace();
             if (restoreData.folder === UNKNOWN_EMPTY_WINDOW_WORKSPACE.id || restoreData.folder === ( (currentWorkspace.folders[0].uri.toString()))) {
+                const options = { selectedCategory: restoreData.category, selectedStep: restoreData.step, pinned: false };
                 this.editorService.openEditor({
                     resource: GettingStartedInput.RESOURCE,
-                    options: { selectedCategory: restoreData.category, selectedStep: restoreData.step, pinned: false },
+                    options
                 });
-                this.storageService.remove(restoreWalkthroughsConfigurationKey, 0 );
+                this.storageService.remove(restoreWalkthroughsConfigurationKey, StorageScope.PROFILE);
                 return true;
             }
         }
@@ -173,11 +178,11 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
         if (editor?.typeId === startupEditorTypeID || ( (this.editorService.editors.some(e => e.typeId === startupEditorTypeID)))) {
             return;
         }
-        const options = editor ? { pinned: false, index: 0 } : { pinned: false };
+        const options = editor ? { pinned: false, index: 0, showTelemetryNotice } : { pinned: false, showTelemetryNotice };
         {
             this.editorService.openEditor({
                 resource: GettingStartedInput.RESOURCE,
-                options: { showTelemetryNotice, ...options },
+                options,
             });
         }
     }
@@ -210,7 +215,7 @@ function isStartupPageEnabled(configurationService, contextService, environmentS
     }
     return startupEditor.value === 'welcomePage'
         || startupEditor.value === 'readme' && (startupEditor.userValue === 'readme' || startupEditor.defaultValue === 'readme')
-        || (contextService.getWorkbenchState() === 1  && startupEditor.value === 'welcomePageInEmptyWorkbench')
+        || (contextService.getWorkbenchState() === WorkbenchState.EMPTY && startupEditor.value === 'welcomePageInEmptyWorkbench')
         || startupEditor.value === 'terminal';
 }
 

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughActions.js

@@ -1,13 +1,15 @@
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { WALK_THROUGH_FOCUS, WalkThroughPart } from './walkThroughPart.js';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 
 const WalkThroughArrowUp = {
     id: 'workbench.action.interactivePlayground.arrowUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: 16 ,
+    primary: KeyCode.UpArrow,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -18,9 +20,9 @@ const WalkThroughArrowUp = {
 };
 const WalkThroughArrowDown = {
     id: 'workbench.action.interactivePlayground.arrowDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: 18 ,
+    primary: KeyCode.DownArrow,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -31,9 +33,9 @@ const WalkThroughArrowDown = {
 };
 const WalkThroughPageUp = {
     id: 'workbench.action.interactivePlayground.pageUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: 11 ,
+    primary: KeyCode.PageUp,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -44,9 +46,9 @@ const WalkThroughPageUp = {
 };
 const WalkThroughPageDown = {
     id: 'workbench.action.interactivePlayground.pageDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: 12 ,
+    primary: KeyCode.PageDown,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.js

@@ -5,6 +5,7 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { requireToContent } from '../common/walkThroughContentProvider.js';
+import { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
@@ -28,7 +29,7 @@ class WalkThroughModel extends EditorModel {
 }
 let WalkThroughInput = WalkThroughInput_1 = class WalkThroughInput extends EditorInput {
     get capabilities() {
-        return 8  | super.capabilities;
+        return EditorInputCapabilities.Singleton | super.capabilities;
     }
     get resource() { return this.options.resource; }
     constructor(options, instantiationService, textModelResolverService) {

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.js

@@ -3,6 +3,7 @@ import '../common/walkThroughUtils.js';
 import './media/walkThroughPart.css.js';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Gesture, EventType } from 'vscode/vscode/vs/base/browser/touch';
+import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
 import { escape } from 'vscode/vscode/vs/base/common/strings';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -21,12 +22,13 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { isObject } from 'vscode/vscode/vs/base/common/types';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { UILabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { size, safeInnerHtml, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { isHTMLElement, isHTMLAnchorElement, isHTMLButtonElement, size, safeInnerHtml, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
@@ -58,8 +60,8 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
         this.content.tabIndex = 0;
         this.content.style.outlineStyle = 'none';
         this.scrollbar = ( (new DomScrollableElement(this.content, {
-            horizontal: 1 ,
-            vertical: 1
+            horizontal: ScrollbarVisibility.Auto,
+            vertical: ScrollbarVisibility.Auto
         })));
         this.disposables.add(this.scrollbar);
         container.appendChild(this.scrollbar.getDomNode());
@@ -98,12 +100,12 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
             this.editorFocus.reset();
         }));
         this.disposables.add(this.addEventListener(this.content, 'focusin', (e) => {
-            if (e.target instanceof HTMLElement && e.target.classList.contains('zone-widget-container')) {
+            if (isHTMLElement(e.target) && e.target.classList.contains('zone-widget-container')) {
                 const scrollPosition = this.scrollbar.getScrollPosition();
                 this.content.scrollTop = scrollPosition.scrollTop;
                 this.content.scrollLeft = scrollPosition.scrollLeft;
             }
-            if (e.target instanceof HTMLElement) {
+            if (isHTMLElement(e.target)) {
                 this.lastFocus = e.target;
             }
         }));
@@ -111,7 +113,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
     registerClickHandler() {
         this.content.addEventListener('click', event => {
             for (let node = event.target; node; node = node.parentNode) {
-                if (node instanceof HTMLAnchorElement && node.href) {
+                if (isHTMLAnchorElement(node) && node.href) {
                     const baseElement = node.ownerDocument.getElementsByTagName('base')[0] || this.window.location;
                     if (baseElement && node.href.indexOf(baseElement.href) >= 0 && node.hash) {
                         const scrollTarget = this.content.querySelector(node.hash);
@@ -128,7 +130,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                     event.preventDefault();
                     break;
                 }
-                else if (node instanceof HTMLButtonElement) {
+                else if (isHTMLButtonElement(node)) {
                     const href = node.getAttribute('data-href');
                     if (href) {
                         this.open(( (URI.parse(href))));
@@ -263,7 +265,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                 editor.setModel(model);
                 this.contentDisposables.push(editor);
                 const updateHeight = (initial) => {
-                    const lineHeight = editor.getOption(67 );
+                    const lineHeight = editor.getOption(EditorOption.lineHeight);
                     const height = `${Math.max(model.getLineCount() + 1, 4) * lineHeight}px`;
                     if (div.style.height !== height) {
                         div.style.height = height;
@@ -280,7 +282,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                     if (innerContent) {
                         const targetTop = div.getBoundingClientRect().top;
                         const containerTop = innerContent.getBoundingClientRect().top;
-                        const lineHeight = editor.getOption(67 );
+                        const lineHeight = editor.getOption(EditorOption.lineHeight);
                         const lineTop = (targetTop + (e.position.lineNumber - 1) * lineHeight) - containerTop;
                         const lineBottom = lineTop + lineHeight;
                         const scrollDimensions = this.scrollbar.getScrollDimensions();
@@ -363,7 +365,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
     multiCursorModifier() {
         const labels = UILabelProvider.modifierLabels[OS];
         const value = this.configurationService.getValue('editor.multiCursorModifier');
-        const modifier = labels[value === 'ctrlCmd' ? (OS === 2  ? 'metaKey' : 'ctrlKey') : 'altKey'];
+        const modifier = labels[value === 'ctrlCmd' ? (OS === OperatingSystem.Macintosh ? 'metaKey' : 'ctrlKey') : 'altKey'];
         const keys = this.content.querySelectorAll('.multi-cursor-modifier');
         Array.prototype.forEach.call(keys, (key) => {
             while (key.firstChild) {

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { DefaultEndOfLine, EndOfLinePreference } from 'vscode/vscode/vs/editor/common/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -57,10 +58,10 @@ let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider
                 }
                 return '';
             };
-            const textBuffer = factory.create(1 ).textBuffer;
+            const textBuffer = factory.create(DefaultEndOfLine.LF).textBuffer;
             const lineCount = textBuffer.getLineCount();
             const range = ( new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1));
-            const markdown = textBuffer.getValueInRange(range, 0 );
+            const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
             marked_1(markdown, { renderer });
         }
         return assertIsDefined(codeEditorModel);