Allow welcome content in custom views

alexr00 · alexr00 · commit 85dda6d7f553 · 2020-03-06T10:48:49.000+01:00
Fixes microsoft#92143
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
@@ -67,6 +67,7 @@ export class CustomTreeViewPane extends ViewPane {
 		this._register(this.treeView.onDidChangeTitle((newTitle) => this.updateTitle(newTitle)));
 		this._register(toDisposable(() => this.treeView.setVisibility(false)));
 		this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
+		this._register(this.treeView.onDidChangeWelcomeState(() => this._onDidChangeViewWelcomeState.fire()));
 		this.updateTreeVisibility();
 	}
 
@@ -83,6 +84,10 @@ export class CustomTreeViewPane extends ViewPane {
 		}
 	}
 
+	shouldShowWelcome(): boolean {
+		return (this.treeView.dataProvider === undefined) && (this.treeView.message === undefined);
+	}
+
 	layoutBody(height: number, width: number): void {
 		this.treeView.layout(height, width);
 	}
@@ -151,6 +156,9 @@ export class CustomTreeView extends Disposable implements ITreeView {
 	private readonly _onDidChangeActions: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChangeActions: Event<void> = this._onDidChangeActions.event;
 
+	private readonly _onDidChangeWelcomeState: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChangeWelcomeState: Event<void> = this._onDidChangeWelcomeState.event;
+
 	private readonly _onDidChangeTitle: Emitter<string> = this._register(new Emitter<string>());
 	readonly onDidChangeTitle: Event<string> = this._onDidChangeTitle.event;
 
@@ -223,6 +231,8 @@ export class CustomTreeView extends Disposable implements ITreeView {
 			this._dataProvider = undefined;
 			this.updateMessage();
 		}
+
+		this._onDidChangeWelcomeState.fire();
 	}
 
 	private _message: string | undefined;
@@ -233,6 +243,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
 	set message(message: string | undefined) {
 		this._message = message;
 		this.updateMessage();
+		this._onDidChangeWelcomeState.fire();
 	}
 
 	get title(): string {
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
@@ -488,6 +488,8 @@ export interface ITreeView extends IDisposable {
 
 	readonly onDidChangeTitle: Event<string>;
 
+	readonly onDidChangeWelcomeState: Event<void>;
+
 	refresh(treeItems?: ITreeItem[]): Promise<void>;
 
 	setVisibility(visible: boolean): void;
diff --git a/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts b/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts
@@ -40,7 +40,6 @@ 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
`@@ -67,6 +67,7 @@ export class CustomTreeViewPane extends ViewPane {`
`67`	`67`	`this._register(this.treeView.onDidChangeTitle((newTitle) => this.updateTitle(newTitle)));`
`68`	`68`	`this._register(toDisposable(() => this.treeView.setVisibility(false)));`
`69`	`69`	`this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));`
	`70`	`+ this._register(this.treeView.onDidChangeWelcomeState(() => this._onDidChangeViewWelcomeState.fire()));`
`70`	`71`	`this.updateTreeVisibility();`
`71`	`72`	`}`
`72`	`73`
`@@ -83,6 +84,10 @@ export class CustomTreeViewPane extends ViewPane {`
`83`	`84`	`}`
`84`	`85`	`}`
`85`	`86`
	`87`	`+ shouldShowWelcome(): boolean {`
	`88`	`+ return (this.treeView.dataProvider === undefined) && (this.treeView.message === undefined);`
	`89`	`+ }`
	`90`	`+`
`86`	`91`	`layoutBody(height: number, width: number): void {`
`87`	`92`	`this.treeView.layout(height, width);`
`88`	`93`	`}`
`@@ -151,6 +156,9 @@ export class CustomTreeView extends Disposable implements ITreeView {`
`151`	`156`	`private readonly _onDidChangeActions: Emitter<void> = this._register(new Emitter<void>());`
`152`	`157`	`readonly onDidChangeActions: Event<void> = this._onDidChangeActions.event;`
`153`	`158`
	`159`	`+ private readonly _onDidChangeWelcomeState: Emitter<void> = this._register(new Emitter<void>());`
	`160`	`+ readonly onDidChangeWelcomeState: Event<void> = this._onDidChangeWelcomeState.event;`
	`161`	`+`
`154`	`162`	`private readonly _onDidChangeTitle: Emitter<string> = this._register(new Emitter<string>());`
`155`	`163`	`readonly onDidChangeTitle: Event<string> = this._onDidChangeTitle.event;`
`156`	`164`
`@@ -223,6 +231,8 @@ export class CustomTreeView extends Disposable implements ITreeView {`
`223`	`231`	`this._dataProvider = undefined;`
`224`	`232`	`this.updateMessage();`
`225`	`233`	`}`
	`234`	`+`
	`235`	`+ this._onDidChangeWelcomeState.fire();`
`226`	`236`	`}`
`227`	`237`
`228`	`238`	`private _message: string \| undefined;`
`@@ -233,6 +243,7 @@ export class CustomTreeView extends Disposable implements ITreeView {`
`233`	`243`	`set message(message: string \| undefined) {`
`234`	`244`	`this._message = message;`
`235`	`245`	`this.updateMessage();`
	`246`	`+ this._onDidChangeWelcomeState.fire();`
`236`	`247`	`}`
`237`	`248`
`238`	`249`	`get title(): string {`