diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts index 166921e8b6c77..3ef5ca1965091 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts @@ -299,18 +299,6 @@ configurationRegistry.registerConfiguration({ default: true, description: localize('workbench.welcomePage.walkthroughs.openOnInstall', "When enabled, an extension's walkthrough will open upon install of the extension.") }, - 'workbench.welcomePage.experimental.videoTutorials': { - scope: ConfigurationScope.MACHINE, - type: 'string', - enum: [ - 'off', - 'on', - 'experimental' - ], - tags: ['experimental'], - default: 'off', - description: localize('workbench.welcomePage.videoTutorials', "When enabled, the get started page has additional links to video tutorials.") - }, 'workbench.startupEditor': { 'scope': ConfigurationScope.RESOURCE, 'type': 'string', diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts index 65948c2e3b3b8..21b2c7b60ef57 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts @@ -20,8 +20,8 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten export class GettingStartedDetailsRenderer { - private mdCache = new ResourceMap>(); - private svgCache = new ResourceMap>(); + private mdCache = new ResourceMap(); + private svgCache = new ResourceMap(); constructor( @IFileService private readonly fileService: IFileService, @@ -204,18 +204,19 @@ export class GettingStartedDetailsRenderer { `; } - private readAndCacheSVGFile(path: URI): Promise { + private async readAndCacheSVGFile(path: URI): Promise { if (!this.svgCache.has(path)) { - this.svgCache.set(path, this.readContentsOfPath(path, false)); + const contents = await this.readContentsOfPath(path, false); + this.svgCache.set(path, contents); } return assertIsDefined(this.svgCache.get(path)); } - private readAndCacheStepMarkdown(path: URI, base: URI): Promise { + private async readAndCacheStepMarkdown(path: URI, base: URI): Promise { if (!this.mdCache.has(path)) { - this.mdCache.set(path, - this.readContentsOfPath(path).then(rawContents => - renderMarkdownDocument(transformUris(rawContents, base), this.extensionService, this.languageService, true, true))); + const contents = await this.readContentsOfPath(path); + const markdownContents = await renderMarkdownDocument(transformUris(contents, base), this.extensionService, this.languageService, true, true); + this.mdCache.set(path, markdownContents); } return assertIsDefined(this.mdCache.get(path)); } diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts index 1a6eaac0d7971..e2b36756483a6 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -371,14 +371,8 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ this.metadata.set(categoryID, { firstSeen: +new Date(), stepIDs: walkthrough.steps?.map(s => s.id) ?? [], manaullyOpened: false }); } - const override = await Promise.race([ - this.tasExperimentService?.getTreatment(`gettingStarted.overrideCategory.${extension.identifier.value + '.' + walkthrough.id}.when`), - new Promise(resolve => setTimeout(() => resolve(walkthrough.when), 5000)) - ]); - - if ( - this.sessionInstalledExtensions.has(extension.identifier.value.toLowerCase()) - && this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true()) + if (this.sessionInstalledExtensions.has(extension.identifier.value.toLowerCase()) + && this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(walkthrough.when) ?? ContextKeyExpr.true()) ) { this.sessionInstalledExtensions.delete(extension.identifier.value.toLowerCase()); if (index < sectionToOpenIndex && isNewlyInstalled) { @@ -460,7 +454,7 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ ? FileAccess.uriToBrowserUri(joinPath(extension.extensionLocation, iconStr)).toString(true) : DefaultIconPath }, - when: ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true(), + when: ContextKeyExpr.deserialize(walkthrough.when) ?? ContextKeyExpr.true(), } as const; this._registerWalkthrough(walkthoughDescriptor); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts index aef3bc1b1d098..9fca852702e4f 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts @@ -65,16 +65,6 @@ export const startEntries: GettingStartedStartEntryContent = [ command: 'command:welcome.showNewFileEntries', } }, - // { - // id: 'welcome.showNewFolderEntries', - // title: localize('gettingStarted.newFolder.title', "New Folder..."), - // description: localize('gettingStarted.newFolder.description', "Create a folder from a Git repo or an extension contributed template folder"), - // icon: Codicon.newFolder, - // content: { - // type: 'startEntry', - // command: 'welcome.showNewFolderEntries', - // } - // }, { id: 'topLevelOpenMac', title: localize('gettingStarted.openMac.title', "Open..."), @@ -152,28 +142,6 @@ export const startEntries: GettingStartedStartEntryContent = [ command: 'command:welcome.showAllWalkthroughs', } }, - { - id: 'topLevelVideoTutorials', - title: localize('gettingStarted.topLevelVideoTutorials.title', "Watch Video Tutorials"), - description: localize('gettingStarted.topLevelVideoTutorials.description', "Watch our series of short & practical video tutorials for VS Code's key features."), - icon: Codicon.playCircle, - when: 'config.workbench.welcomePage.experimental.videoTutorials == on', - content: { - type: 'startEntry', - command: 'https://aka.ms/vscode-getting-started-video', - } - }, - { - id: 'topLevelVideoTutorialsExperimental', - title: localize('gettingStarted.topLevelVideoTutorials.title', "Watch Video Tutorials"), - description: localize('gettingStarted.topLevelVideoTutorials.description', "Watch our series of short & practical video tutorials for VS Code's key features."), - when: 'config.workbench.welcomePage.experimental.videoTutorials == experimental', - icon: Codicon.playCircle, - content: { - type: 'startEntry', - command: 'https://aka.ms/vscode-videos', - } - }, { id: 'topLevelRemoteOpen', title: localize('gettingStarted.topLevelRemoteOpen.title', "Connect to..."),