@codingame/monaco-vscode-walkthrough-service-override 9.0.2 → 10.0.0

package/package.json

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

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

@@ -9,27 +9,27 @@ 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, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions } 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 { OperatingSystem, isMacintosh, isLinux, isWindows } from 'vscode/vscode/vs/base/common/platform';
+import { 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';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
+import { GettingStartedAccessibleView } from './gettingStartedAccessibleView.js';
 import './gettingStartedService._contribution.js';
 import './gettingStartedIcons.js';
 
@@ -37,7 +37,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.openWalkthrough',
-            title: ( localize2(3130, 'Welcome')),
+            title: ( localize2(3167, 'Welcome')),
             category: Categories.Help,
             f1: true,
             menu: {
@@ -46,7 +46,7 @@ registerAction2(class extends Action2 {
                 order: 1,
             },
             metadata: {
-                description: ( localize2(3131, 'Opens a Walkthrough to help you get started in VS Code.'))
+                description: ( localize2(3168, 'Opens a Walkthrough to help you get started in VS Code.'))
             }
         });
     }
@@ -57,7 +57,13 @@ registerAction2(class extends Action2 {
         const commandService = accessor.get(ICommandService);
         if (walkthroughID) {
             const selectedCategory = typeof walkthroughID === 'string' ? walkthroughID : walkthroughID.category;
-            const selectedStep = typeof walkthroughID === 'string' ? undefined : walkthroughID.category + '#' + walkthroughID.step;
+            let selectedStep;
+            if (typeof walkthroughID === 'object' && 'category' in walkthroughID && 'step' in walkthroughID) {
+                selectedStep = `${walkthroughID.category}#${walkthroughID.step}`;
+            }
+            else {
+                selectedStep = undefined;
+            }
             if (!selectedCategory && !selectedStep) {
                 editorService.openEditor({
                     resource: GettingStartedInput.RESOURCE,
@@ -67,6 +73,8 @@ registerAction2(class extends Action2 {
             }
             for (const group of editorGroupsService.groups) {
                 if (group.activeEditor instanceof GettingStartedInput) {
+                    const activeEditor = group.activeEditor;
+                    activeEditor.showWelcome = false;
                     group.activeEditorPane.makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
                     return;
                 }
@@ -78,6 +86,7 @@ registerAction2(class extends Action2 {
                     if (!editor.selectedCategory && group) {
                         editor.selectedCategory = selectedCategory;
                         editor.selectedStep = selectedStep;
+                        editor.showWelcome = false;
                         group.openEditor(editor, { revealIfOpened: true });
                         return;
                     }
@@ -85,6 +94,7 @@ registerAction2(class extends Action2 {
             }
             const activeEditor = editorService.activeEditor;
             if (selectedStep && activeEditor instanceof GettingStartedInput && activeEditor.selectedCategory === selectedCategory) {
+                activeEditor.showWelcome = false;
                 commandService.executeCommand('walkthroughs.selectStep', selectedStep);
                 return;
             }
@@ -92,11 +102,11 @@ registerAction2(class extends Action2 {
                 const activeGroup = editorGroupsService.activeGroup;
                 activeGroup.replaceEditors([{
                         editor: activeEditor,
-                        replacement: instantiationService.createInstance(GettingStartedInput, { selectedCategory: selectedCategory, selectedStep: selectedStep })
+                        replacement: instantiationService.createInstance(GettingStartedInput, { selectedCategory: selectedCategory, selectedStep: selectedStep, showWelcome: false })
                     }]);
             }
             else {
-                const options = { selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false };
+                const options = { selectedCategory: selectedCategory, selectedStep: selectedStep, showWelcome: false, preserveFocus: toSide ?? false };
                 editorService.openEditor({
                     resource: GettingStartedInput.RESOURCE,
                     options
@@ -114,19 +124,19 @@ registerAction2(class extends Action2 {
     }
 });
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(GettingStartedInput.ID, GettingStartedInputSerializer);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(3132, "Welcome"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(3169, "Welcome"))), [
     ( (new SyncDescriptor(GettingStartedInput)))
 ]);
-const category = ( localize2(3132, "Welcome"));
+const category = ( localize2(3169, "Welcome"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.goBack',
-            title: ( localize2(3133, 'Go Back')),
+            title: ( localize2(3170, 'Go Back')),
             category,
             keybinding: {
-                weight: KeybindingWeight.EditorContrib,
-                primary: KeyCode.Escape,
+                weight: 100 ,
+                primary: 9 ,
                 when: inWelcomeContext
             },
             precondition: ( (ContextKeyExpr.equals('activeEditor', 'gettingStartedPage'))),
@@ -158,7 +168,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepComplete',
-            title: ( localize(3134, "Mark Step Complete")),
+            title: ( localize(3171, "Mark Step Complete")),
             category,
         });
     }
@@ -174,7 +184,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.markStepIncomplete',
-            title: ( localize(3135, "Mark Step Incomplete")),
+            title: ( localize(3172, "Mark Step Incomplete")),
             category,
         });
     }
@@ -190,7 +200,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'welcome.showAllWalkthroughs',
-            title: ( localize2(3136, 'Open Walkthrough...')),
+            title: ( localize2(3173, 'Open Walkthrough...')),
             category,
             f1: true,
         });
@@ -219,7 +229,7 @@ registerAction2(class extends Action2 {
         quickPick.canSelectMany = false;
         quickPick.matchOnDescription = true;
         quickPick.matchOnDetail = true;
-        quickPick.placeholder = ( localize(3137, 'Select a walkthrough to open'));
+        quickPick.placeholder = ( localize(3174, 'Select a walkthrough to open'));
         quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
         quickPick.busy = true;
         disposables.add(quickPick.onDidAccept(() => {
@@ -239,7 +249,7 @@ registerAction2(class extends Action2 {
     }
 });
 const WorkspacePlatform = ( (new RawContextKey('workspacePlatform', undefined, ( localize(
-    3138,
+    3175,
     "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 {
@@ -250,9 +260,9 @@ let WorkspacePlatformContribution = class WorkspacePlatformContribution {
         this.contextService = contextService;
         this.remoteAgentService.getEnvironment().then(env => {
             const remoteOS = env?.os;
-            const remotePlatform = remoteOS === OperatingSystem.Macintosh ? 'mac'
-                : remoteOS === OperatingSystem.Windows ? 'windows'
-                    : remoteOS === OperatingSystem.Linux ? 'linux'
+            const remotePlatform = remoteOS === 2  ? 'mac'
+                : remoteOS === 1  ? 'windows'
+                    : remoteOS === 3  ? 'linux'
                         : undefined;
             if (remotePlatform) {
                 WorkspacePlatform.bindTo(this.contextService).set(remotePlatform);
@@ -287,52 +297,53 @@ configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         'workbench.welcomePage.walkthroughs.openOnInstall': {
-            scope: ConfigurationScope.MACHINE,
+            scope: 2 ,
             type: 'boolean',
             default: true,
             description: ( localize(
-                3139,
+                3176,
                 "When enabled, an extension's walkthrough will open upon install of the extension."
             ))
         },
         'workbench.startupEditor': {
-            'scope': ConfigurationScope.RESOURCE,
+            'scope': 4 ,
             'type': 'string',
             'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal'],
             'enumDescriptions': [
-                ( localize(3140, "Start without an editor.")),
+                ( localize(3177, "Start without an editor.")),
                 ( localize(
-                    3141,
+                    3178,
                     "Open the Welcome page, with content to aid in getting started with VS Code and extensions."
                 )),
                 ( localize(
-                    3142,
+                    3179,
                     "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(
-                    3143,
+                    3180,
                     "Open a new untitled text file (only applies when opening an empty window)."
                 )),
-                ( localize(3144, "Open the Welcome page when opening an empty workbench.")),
-                ( localize(3145, "Open a new terminal in the editor area.")),
+                ( localize(3181, "Open the Welcome page when opening an empty workbench.")),
+                ( localize(3182, "Open a new terminal in the editor area.")),
             ],
             'default': 'welcomePage',
             'description': ( localize(
-                3146,
+                3183,
                 "Controls which editor is shown at startup, if none are restored from the previous session."
             ))
         },
         'workbench.welcomePage.preferReducedMotion': {
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             type: 'boolean',
             default: false,
-            deprecationMessage: ( localize(3147, "Deprecated, use the global `workbench.reduceMotion`.")),
-            description: ( localize(3148, "When enabled, reduce motion in welcome page."))
+            deprecationMessage: ( localize(3184, "Deprecated, use the global `workbench.reduceMotion`.")),
+            description: ( localize(3185, "When enabled, reduce motion in welcome page."))
         }
     }
 });
-registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(WorkspacePlatformContribution.ID, WorkspacePlatformContribution, 3 );
+registerWorkbenchContribution2(StartupPageEditorResolverContribution.ID, StartupPageEditorResolverContribution, 2 );
+registerWorkbenchContribution2(StartupPageRunnerContribution.ID, StartupPageRunnerContribution, 3 );
+AccessibleViewRegistry.register(( (new GettingStartedAccessibleView())));
 
 export { WorkspacePlatform };