fixes microsoft#91466

joaomoreno · joaomoreno · commit 04c9b01affe9 · 2020-02-27T09:24:38.000+01:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -1825,37 +1825,37 @@
     },
     "viewsWelcome": [
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.disabled%",
         "when": "!config.git.enabled"
       },
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.missing%",
         "when": "config.git.enabled && git.missing"
       },
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.empty%",
         "when": "config.git.enabled && !git.missing && workbenchState == empty"
       },
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.folder%",
         "when": "config.git.enabled && !git.missing && workbenchState == folder"
       },
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.workspace%",
         "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0"
       },
       {
-        "view": "workbench.scm",
+        "view": "scm",
         "contents": "%view.workbench.scm.emptyWorkspace%",
         "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0"
       },
       {
-        "view": "workbench.explorer.emptyView",
+        "view": "explorer",
         "contents": "%view.workbench.cloneRepository%"
       }
     ]
diff --git a/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts b/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts
@@ -7,7 +7,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ViewsWelcomeExtensionPoint, ViewWelcome, viewsWelcomeExtensionPointDescriptor } from './viewsWelcomeExtensionPoint';
+import { ViewsWelcomeExtensionPoint, ViewWelcome, viewsWelcomeExtensionPointDescriptor, ViewIdentifierMap } from './viewsWelcomeExtensionPoint';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions as ViewContainerExtensions, IViewsRegistry, ViewContentPriority } from 'vs/workbench/common/views';
 import { localize } from 'vs/nls';
@@ -45,7 +45,8 @@ export class ViewsWelcomeContribution extends Disposable implements IWorkbenchCo
 				}
 
 				for (const welcome of contribution.value) {
-					const disposable = viewsRegistry.registerViewWelcomeContent(welcome.view, {
+					const id = ViewIdentifierMap[welcome.view] ?? welcome.view;
+					const disposable = viewsRegistry.registerViewWelcomeContent(id, {
 						content: welcome.contents,
 						when: ContextKeyExpr.deserialize(welcome.when),
 						priority: contribution.description.isBuiltin ? ViewContentPriority.Low : ViewContentPriority.Lowest
diff --git a/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts b/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts
@@ -20,6 +20,12 @@ export interface ViewWelcome {
 
 export type ViewsWelcomeExtensionPoint = ViewWelcome[];
 
+export const ViewIdentifierMap: { [key: string]: string } = {
+	'explorer': 'workbench.explorer.emptyView',
+	'debug': 'workbench.debug.startView',
+	'scm': 'workbench.scm',
+};
+
 const viewsWelcomeExtensionPointSchema = Object.freeze<IConfigurationPropertySchema>({
 	type: 'array',
 	description: nls.localize('contributes.viewsWelcome', "Contributed views welcome content. Welcome content will be rendered in views whenever they have no meaningful content to display, ie. the File Explorer when no folder is open. Such content is useful as in-product documentation to drive users to use certain features before they are available. A good example would be a `Clone Repository` button in the File Explorer welcome view."),
@@ -34,6 +40,7 @@ const viewsWelcomeExtensionPointSchema = Object.freeze<IConfigurationPropertySch
 			[ViewsWelcomeExtensionPointFields.view]: {
 				type: 'string',
 				description: nls.localize('contributes.viewsWelcome.view.view', "Target view identifier for this welcome content."),
+				enum: Object.keys(ViewIdentifierMap),
 			},
 			[ViewsWelcomeExtensionPointFields.contents]: {
 				type: 'string',

Original file line number	Diff line number	Diff line change
`@@ -1825,37 +1825,37 @@`
`1825`	`1825`	`},`
`1826`	`1826`	`"viewsWelcome": [`
`1827`	`1827`	`{`
`1828`		`- "view": "workbench.scm",`
	`1828`	`+ "view": "scm",`
`1829`	`1829`	`"contents": "%view.workbench.scm.disabled%",`
`1830`	`1830`	`"when": "!config.git.enabled"`
`1831`	`1831`	`},`
`1832`	`1832`	`{`
`1833`		`- "view": "workbench.scm",`
	`1833`	`+ "view": "scm",`
`1834`	`1834`	`"contents": "%view.workbench.scm.missing%",`
`1835`	`1835`	`"when": "config.git.enabled && git.missing"`
`1836`	`1836`	`},`
`1837`	`1837`	`{`
`1838`		`- "view": "workbench.scm",`
	`1838`	`+ "view": "scm",`
`1839`	`1839`	`"contents": "%view.workbench.scm.empty%",`
`1840`	`1840`	`"when": "config.git.enabled && !git.missing && workbenchState == empty"`
`1841`	`1841`	`},`
`1842`	`1842`	`{`
`1843`		`- "view": "workbench.scm",`
	`1843`	`+ "view": "scm",`
`1844`	`1844`	`"contents": "%view.workbench.scm.folder%",`
`1845`	`1845`	`"when": "config.git.enabled && !git.missing && workbenchState == folder"`
`1846`	`1846`	`},`
`1847`	`1847`	`{`
`1848`		`- "view": "workbench.scm",`
	`1848`	`+ "view": "scm",`
`1849`	`1849`	`"contents": "%view.workbench.scm.workspace%",`
`1850`	`1850`	`"when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0"`
`1851`	`1851`	`},`
`1852`	`1852`	`{`
`1853`		`- "view": "workbench.scm",`
	`1853`	`+ "view": "scm",`
`1854`	`1854`	`"contents": "%view.workbench.scm.emptyWorkspace%",`
`1855`	`1855`	`"when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0"`
`1856`	`1856`	`},`
`1857`	`1857`	`{`
`1858`		`- "view": "workbench.explorer.emptyView",`
	`1858`	`+ "view": "explorer",`
`1859`	`1859`	`"contents": "%view.workbench.cloneRepository%"`
`1860`	`1860`	`}`
`1861`	`1861`	`]`