microsoft#29609 Check for split view existence

sandy081 · sandy081 · commit ff1d3c2f0f33 · 2017-06-28T18:20:24.000+02:00
diff --git a/src/vs/workbench/parts/views/browser/views.ts b/src/vs/workbench/parts/views/browser/views.ts
@@ -359,22 +359,22 @@ export class ComposedViewsViewlet extends Viewlet {
 
 	public getTitle(): string {
 		let title = Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet(this.getId()).name;
-		if (this.hasSingleView()) {
+		if (this.hasSingleView() && this.views[0]) {
 			title += ': ' + this.views[0].name;
 		}
 		return title;
 	}
 
 	public getActions(): IAction[] {
-		if (this.hasSingleView()) {
+		if (this.hasSingleView() && this.views[0]) {
 			return this.views[0].getActions();
 		}
 		return [];
 	}
 
 	public getSecondaryActions(): IAction[] {
 		let actions = [];
-		if (this.hasSingleView()) {
+		if (this.hasSingleView() && this.views[0]) {
 			actions = this.views[0].getSecondaryActions();
 		}
 
@@ -419,10 +419,12 @@ export class ComposedViewsViewlet extends Viewlet {
 	}
 
 	private layoutViews(): void {
-		this.splitView.layout(this.dimension.height);
-		for (const view of this.views) {
-			let viewState = this.createViewState(view);
-			this.viewsStates.set(view.id, viewState);
+		if (this.splitView) {
+			this.splitView.layout(this.dimension.height);
+			for (const view of this.views) {
+				let viewState = this.createViewState(view);
+				this.viewsStates.set(view.id, viewState);
+			}
 		}
 	}
 
@@ -580,6 +582,10 @@ export class ComposedViewsViewlet extends Viewlet {
 	}
 
 	private onViewsUpdated(): TPromise<void> {
+		if (!this.splitView) {
+			return TPromise.as(null);
+		}
+
 		if (this.hasSingleView()) {
 			if (this.views[0]) {
 				this.views[0].hideHeader();

Original file line number	Diff line number	Diff line change
`@@ -359,22 +359,22 @@ export class ComposedViewsViewlet extends Viewlet {`
`359`	`359`
`360`	`360`	`public getTitle(): string {`
`361`	`361`	`let title = Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet(this.getId()).name;`
`362`		`- if (this.hasSingleView()) {`
	`362`	`+ if (this.hasSingleView() && this.views[0]) {`
`363`	`363`	`title += ': ' + this.views[0].name;`
`364`	`364`	`}`
`365`	`365`	`return title;`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`public getActions(): IAction[] {`
`369`		`- if (this.hasSingleView()) {`
	`369`	`+ if (this.hasSingleView() && this.views[0]) {`
`370`	`370`	`return this.views[0].getActions();`
`371`	`371`	`}`
`372`	`372`	`return [];`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`public getSecondaryActions(): IAction[] {`
`376`	`376`	`let actions = [];`
`377`		`- if (this.hasSingleView()) {`
	`377`	`+ if (this.hasSingleView() && this.views[0]) {`
`378`	`378`	`actions = this.views[0].getSecondaryActions();`
`379`	`379`	`}`
`380`	`380`
`@@ -419,10 +419,12 @@ export class ComposedViewsViewlet extends Viewlet {`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`private layoutViews(): void {`
`422`		`- this.splitView.layout(this.dimension.height);`
`423`		`- for (const view of this.views) {`
`424`		`- let viewState = this.createViewState(view);`
`425`		`- this.viewsStates.set(view.id, viewState);`
	`422`	`+ if (this.splitView) {`
	`423`	`+ this.splitView.layout(this.dimension.height);`
	`424`	`+ for (const view of this.views) {`
	`425`	`+ let viewState = this.createViewState(view);`
	`426`	`+ this.viewsStates.set(view.id, viewState);`
	`427`	`+ }`
`426`	`428`	`}`
`427`	`429`	`}`
`428`	`430`
`@@ -580,6 +582,10 @@ export class ComposedViewsViewlet extends Viewlet {`
`580`	`582`	`}`
`581`	`583`
`582`	`584`	`private onViewsUpdated(): TPromise<void> {`
	`585`	`+ if (!this.splitView) {`
	`586`	`+ return TPromise.as(null);`
	`587`	`+ }`
	`588`	`+`
`583`	`589`	`if (this.hasSingleView()) {`
`584`	`590`	`if (this.views[0]) {`
`585`	`591`	`this.views[0].hideHeader();`