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

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

@@ -4,28 +4,25 @@ 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, WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+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 { 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 { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 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 { localize } 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 restoreWalkthroughsConfigurationKey = 'workbench.welcomePage.restorableWalkthroughs';
 const configurationKey = 'workbench.startupEditor';
@@ -37,7 +34,7 @@ let StartupPageEditorResolverContribution = class StartupPageEditorResolverContr
         this.instantiationService = instantiationService;
         editorResolverService.registerEditor(`${GettingStartedInput.RESOURCE.scheme}:/**`, {
             id: GettingStartedInput.ID,
-            label: ( localize(7520, "Welcome Page")),
+            label: ( localize(7577, "Welcome Page")),
             priority: RegisteredEditorPriority.builtin,
         }, {
             singlePerResource: false,
@@ -59,9 +56,10 @@ StartupPageEditorResolverContribution = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, IEditorResolverService)))
 ], StartupPageEditorResolverContribution)));
-let StartupPageRunnerContribution = class StartupPageRunnerContribution {
+let StartupPageRunnerContribution = class StartupPageRunnerContribution extends Disposable {
     static { this.ID = 'workbench.contrib.startupPageRunner'; }
     constructor(configurationService, editorService, workingCopyBackupService, fileService, contextService, lifecycleService, layoutService, productService, commandService, environmentService, storageService, logService, notificationService) {
+        super();
         this.configurationService = configurationService;
         this.editorService = editorService;
         this.workingCopyBackupService = workingCopyBackupService;
@@ -76,15 +74,21 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
         this.logService = logService;
         this.notificationService = notificationService;
         this.run().then(undefined, onUnexpectedError);
+        this._register(this.editorService.onDidCloseEditor((e) => {
+            if (e.editor instanceof GettingStartedInput) {
+                e.editor.selectedCategory = undefined;
+                e.editor.selectedStep = undefined;
+            }
+        }));
     }
     async run() {
-        await this.lifecycleService.when(LifecyclePhase.Restored);
+        await this.lifecycleService.when(3 );
         if (this.productService.enableTelemetry
             && this.productService.showTelemetryOptOut
-            && getTelemetryLevel(this.configurationService) !== TelemetryLevel.NONE
+            && getTelemetryLevel(this.configurationService) !== 0
             && !this.environmentService.skipWelcome
-            && !this.storageService.get(telemetryOptOutStorageKey, StorageScope.PROFILE)) {
-            this.storageService.store(telemetryOptOutStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+            && !this.storageService.get(telemetryOptOutStorageKey, 0 )) {
+            this.storageService.store(telemetryOptOutStorageKey, true, 0 , 0 );
             await this.openGettingStarted(true);
             return;
         }
@@ -92,7 +96,7 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
             return;
         }
         const enabled = isStartupPageEnabled(this.configurationService, this.contextService, this.environmentService);
-        if (enabled && this.lifecycleService.startupKind !== StartupKind.ReloadedWindow) {
+        if (enabled && this.lifecycleService.startupKind !== 3 ) {
             const hasBackups = await this.workingCopyBackupService.hasBackups();
             if (hasBackups) {
                 return;
@@ -113,13 +117,13 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
                     await this.openGettingStarted();
                 }
                 else if (startupEditorSetting.value === 'terminal') {
-                    this.commandService.executeCommand(TerminalCommandId.CreateTerminalEditor);
+                    this.commandService.executeCommand("workbench.action.createTerminalEditor" );
                 }
             }
         }
     }
     tryOpenWalkthroughForFolder() {
-        const toRestore = this.storageService.get(restoreWalkthroughsConfigurationKey, StorageScope.PROFILE);
+        const toRestore = this.storageService.get(restoreWalkthroughsConfigurationKey, 0 );
         if (!toRestore) {
             return false;
         }
@@ -132,7 +136,7 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
                     resource: GettingStartedInput.RESOURCE,
                     options
                 });
-                this.storageService.remove(restoreWalkthroughsConfigurationKey, StorageScope.PROFILE);
+                this.storageService.remove(restoreWalkthroughsConfigurationKey, 0 );
                 return true;
             }
         }
@@ -157,7 +161,7 @@ let StartupPageRunnerContribution = class StartupPageRunnerContribution {
                 await Promise.all([
                     this.commandService.executeCommand('markdown.showPreview', null, readmes.filter(isMarkDown), { locked: true }).catch(error => {
                         this.notificationService.error(( localize(
-                            7521,
+                            7578,
                             'Could not open markdown preview: {0}.\n\nPlease make sure the markdown extension is enabled.',
                             error.message
                         )));
@@ -213,7 +217,7 @@ function isStartupPageEnabled(configurationService, contextService, environmentS
     }
     return startupEditor.value === 'welcomePage'
         || startupEditor.value === 'readme' && (startupEditor.userValue === 'readme' || startupEditor.defaultValue === 'readme')
-        || (contextService.getWorkbenchState() === WorkbenchState.EMPTY && startupEditor.value === 'welcomePageInEmptyWorkbench')
+        || (contextService.getWorkbenchState() === 1  && startupEditor.value === 'welcomePageInEmptyWorkbench')
         || startupEditor.value === 'terminal';
 }